diff --git a/Assets/Resources/Games/pajamaParty.prefab b/Assets/Resources/Games/pajamaParty.prefab index e34f62ba..3b7f4a6e 100644 --- a/Assets/Resources/Games/pajamaParty.prefab +++ b/Assets/Resources/Games/pajamaParty.prefab @@ -92,6 +92,7 @@ GameObject: m_Component: - component: {fileID: 46492560261295527} - component: {fileID: 3854691646898488564} + - component: {fileID: 4303970282923767126} m_Layer: 0 m_Name: Bg m_TagString: Untagged @@ -110,6 +111,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 5178544157134124303} - {fileID: 4662964820777549746} - {fileID: 4562460857549487135} - {fileID: 2744385037816936146} @@ -137,6 +139,25 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -2 +--- !u!95 &4303970282923767126 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375714984444580074} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: eca0332c5e5281c43a8a88a6709ec867, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &550880664121880263 GameObject: m_ObjectHideFlags: 0 @@ -416,7 +437,7 @@ Transform: - {fileID: 8463793978818553225} - {fileID: 1599370445243771245} m_Father: {fileID: 46492560261295527} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &653632352243271223 GameObject: @@ -447,7 +468,7 @@ Transform: m_LocalScale: {x: 2.2, y: 2.2, z: 1.0163} m_Children: [] m_Father: {fileID: 46492560261295527} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} --- !u!212 &719494560205725451 SpriteRenderer: @@ -500,6 +521,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &789137697112959123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5178544157134124303} + - component: {fileID: 6730303132776395013} + m_Layer: 0 + m_Name: DV + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5178544157134124303 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789137697112959123} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 8.8, z: 20} + m_LocalScale: {x: 50, y: 6, z: 1} + m_Children: + - {fileID: 567270474528090512} + - {fileID: 2909631519727849689} + m_Father: {fileID: 46492560261295527} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6730303132776395013 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 789137697112959123} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: -200 + m_Sprite: {fileID: -517222260306699803, guid: b9405af27c408da44abc92e14f2fdd89, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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!1 &1077334898981724717 GameObject: m_ObjectHideFlags: 0 @@ -840,7 +945,7 @@ Transform: m_LocalScale: {x: 2, y: 2, z: 1} m_Children: [] m_Father: {fileID: 46492560261295527} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} --- !u!212 &3155451926844291702 SpriteRenderer: @@ -917,8 +1022,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2886202961799992152} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.867443, y: 3.5134025, z: 186.51025} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.867443, y: 3.513402, z: 186.5103} m_LocalScale: {x: 2.2, y: 2.2, z: 1} m_Children: [] m_Father: {fileID: 9117379575252581276} @@ -963,7 +1068,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -2 m_Sprite: {fileID: 756142246335878278, guid: b9405af27c408da44abc92e14f2fdd89, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1329,8 +1434,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3947259256146062913} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -11.766443, y: 0.1434021, z: 186.51025} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.76644, y: 0.1434021, z: 186.5103} m_LocalScale: {x: 2.2, y: 2.2, z: 0.8218866} m_Children: [] m_Father: {fileID: 9117379575252581276} @@ -1375,7 +1480,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -2 m_Sprite: {fileID: 1331845204680278664, guid: b9405af27c408da44abc92e14f2fdd89, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1446,6 +1551,88 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &3956641386693189092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 567270474528090512} + - component: {fileID: 4993300778223643178} + m_Layer: 0 + m_Name: DV (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &567270474528090512 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3956641386693189092} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 3.8, z: -19} + m_LocalScale: {x: 1, y: -5, z: 1} + m_Children: [] + m_Father: {fileID: 5178544157134124303} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!212 &4993300778223643178 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3956641386693189092} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: -200 + m_Sprite: {fileID: -517222260306699803, guid: b9405af27c408da44abc92e14f2fdd89, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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!1 &4021753377255973015 GameObject: m_ObjectHideFlags: 0 @@ -1495,6 +1682,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb277585c35c35b4782c158384375c49, type: 3} m_Name: m_EditorClassIdentifier: + SoundSequences: [] EligibleHits: [] scheduledInputs: [] firstEnable: 0 @@ -1790,7 +1978,7 @@ Transform: m_LocalScale: {x: 2.24, y: 2.24, z: 1.0181} m_Children: [] m_Father: {fileID: 46492560261295527} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3842650022794831365 SpriteRenderer: @@ -1904,7 +2092,7 @@ Transform: m_Children: - {fileID: 8244778904798337645} m_Father: {fileID: 46492560261295527} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7494300473592664147 SpriteRenderer: @@ -2069,7 +2257,7 @@ Transform: m_LocalScale: {x: 2.67, y: 2.67, z: 0.8920141} m_Children: [] m_Father: {fileID: 46492560261295527} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} --- !u!212 &1245822143926101164 SpriteRenderer: @@ -2147,7 +2335,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5728659383026458314} m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} - m_LocalPosition: {x: -2.32, y: -3.265, z: 186.51025} + m_LocalPosition: {x: -2.32, y: -3.265, z: 186.5103} m_LocalScale: {x: 1.76, y: -1.1, z: 1} m_Children: [] m_Father: {fileID: 9117379575252581276} @@ -2192,7 +2380,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -2 m_Sprite: {fileID: 756142246335878278, guid: b9405af27c408da44abc92e14f2fdd89, type: 3} m_Color: {r: 1, g: 0.9009434, b: 1, a: 1} m_FlipX: 0 @@ -2228,8 +2416,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5819733317648125933} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -17.55, y: -3.04, z: 186.51025} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -17.55, y: -3.04, z: 186.5103} m_LocalScale: {x: 1.76, y: 1.32, z: 1} m_Children: [] m_Father: {fileID: 9117379575252581276} @@ -2274,7 +2462,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: -2 m_Sprite: {fileID: 756142246335878278, guid: b9405af27c408da44abc92e14f2fdd89, type: 3} m_Color: {r: 1, g: 1, b: 0.6666667, a: 1} m_FlipX: 0 @@ -2316,7 +2504,7 @@ Transform: m_Children: - {fileID: 1669267924760996016} m_Father: {fileID: 46492560261295527} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &5847367595519239544 SpriteRenderer: @@ -2430,7 +2618,7 @@ Transform: m_Children: - {fileID: 2973410872478813613} m_Father: {fileID: 46492560261295527} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!212 &8958342878596420686 SpriteRenderer: @@ -2758,7 +2946,7 @@ Transform: m_LocalScale: {x: 2.4312623, y: 2.4312623, z: 1.085385} m_Children: [] m_Father: {fileID: 46492560261295527} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &897572385996796831 SpriteRenderer: @@ -2811,6 +2999,88 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &7192986472740787559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2909631519727849689} + - component: {fileID: 9184393205011475153} + m_Layer: 0 + m_Name: DV (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2909631519727849689 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7192986472740787559} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -3.8, z: -75} + m_LocalScale: {x: 1, y: 20, z: 1} + m_Children: [] + m_Father: {fileID: 5178544157134124303} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!212 &9184393205011475153 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7192986472740787559} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: -200 + m_Sprite: {fileID: -517222260306699803, guid: b9405af27c408da44abc92e14f2fdd89, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + 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!1 &7614897430818020021 GameObject: m_ObjectHideFlags: 0 @@ -2923,7 +3193,7 @@ Transform: m_Children: - {fileID: 7390755689748042901} m_Father: {fileID: 46492560261295527} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!212 &7778543665163640405 SpriteRenderer: @@ -3087,7 +3357,7 @@ Transform: m_LocalScale: {x: 18, y: 10.8, z: 1} m_Children: [] m_Father: {fileID: 46492560261295527} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7094784181514754658 SpriteRenderer: @@ -3354,7 +3624,7 @@ Transform: m_Children: - {fileID: 6572057236226667489} m_Father: {fileID: 46492560261295527} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 60, y: 0, z: -90} --- !u!212 &271781451773457392 SpriteRenderer: @@ -3518,7 +3788,7 @@ Transform: m_LocalScale: {x: 2.2, y: 2.2, z: 1} m_Children: [] m_Father: {fileID: 46492560261295527} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &9062110740618763131 SpriteRenderer: @@ -3836,7 +4106,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 96bd6db83854f8b4a9126e0e9e4a2e87, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.40392157} m_FlipX: 0 m_FlipY: 0 @@ -3844,6 +4114,6 @@ SpriteRenderer: m_Size: {x: 5.12, y: 5.12} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Games/samuraiSliceNtr.prefab b/Assets/Resources/Games/samuraiSliceNtr.prefab index 93561eac..cf785adc 100644 --- a/Assets/Resources/Games/samuraiSliceNtr.prefab +++ b/Assets/Resources/Games/samuraiSliceNtr.prefab @@ -253,7 +253,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 907170206961966871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.5, y: 0.25, z: 0} + m_LocalPosition: {x: -0.5, y: 0.25, z: -0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2024318448781453715} @@ -5565,7 +5565,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1465141136420999014} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.45, y: -6.2500005, z: 0} + m_LocalPosition: {x: 4.45, y: -6.2500005, z: 0.1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6282202035828239264} @@ -5585,8 +5585,8 @@ MonoBehaviour: m_EditorClassIdentifier: curve: {fileID: 9026471934783822949} handleType: 0 - leftHandleLocalPosition: {x: -2.520605, y: 13.437961, z: -0.060546875} - rightHandleLocalPosition: {x: 2.520605, y: -13.437961, z: 0.060546875} + leftHandleLocalPosition: {x: -2.1442063, y: 13.031189, z: -0.24612674} + rightHandleLocalPosition: {x: 2.1442063, y: -13.031189, z: 0.24612674} --- !u!1 &1658320474579320115 GameObject: m_ObjectHideFlags: 0 @@ -10546,7 +10546,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &6530704449370969801 Transform: m_ObjectHideFlags: 0 @@ -10564,6 +10564,7 @@ Transform: - {fileID: 1151143911982550622} - {fileID: 2505954647570152314} - {fileID: 8272695428826935173} + - {fileID: 2800013509931204424} m_Father: {fileID: 6803714669671852684} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10676,7 +10677,7 @@ Transform: m_GameObject: {fileID: 2644071208260666374} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 3, z: 1} + m_LocalScale: {x: 10, y: 10, z: 1} m_Children: [] m_Father: {fileID: 4578792811399118319} m_RootOrder: 4 @@ -10816,6 +10817,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 00eae865695fcff4e8ccadf976355847, type: 3} m_Name: m_EditorClassIdentifier: + SoundSequences: [] EligibleHits: [] scheduledInputs: [] firstEnable: 0 @@ -10830,6 +10832,7 @@ MonoBehaviour: NgLaunchCurve: {fileID: 8715086685139578075} DebrisLeftCurve: {fileID: 681199269563884239} DebrisRightCurve: {fileID: 6134167994079843062} + NgDebrisCurve: {fileID: 8755454903872010978} --- !u!1 &3625395986258989249 GameObject: m_ObjectHideFlags: 0 @@ -10854,7 +10857,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3625395986258989249} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.5, y: 0.25, z: 0} + m_LocalPosition: {x: 0.5, y: 0.25, z: -0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 325321271260791431} @@ -10884,7 +10887,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3631265297008439238} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.5, y: -5.5, z: -4} + m_LocalPosition: {x: 2, y: -5.5, z: -9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 973145912615694185} @@ -11154,6 +11157,53 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4302608539052114858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8955885138568379988} + - component: {fileID: 6434809315840102058} + m_Layer: 0 + m_Name: Point 0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8955885138568379988 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4302608539052114858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.69, y: 2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2800013509931204424} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6434809315840102058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4302608539052114858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 8755454903872010978} + handleType: 0 + leftHandleLocalPosition: {x: -0.5581093, y: -3.897297, z: -0} + rightHandleLocalPosition: {x: 0.5581093, y: 3.897297, z: 0} --- !u!1 &4322478051307581516 GameObject: m_ObjectHideFlags: 0 @@ -11566,7 +11616,7 @@ Transform: m_GameObject: {fileID: 4891380524077004048} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.425, y: -1.25, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.1, y: 1.1, z: 1} m_Children: - {fileID: 301531489915552307} - {fileID: 6181245624135669693} @@ -12149,6 +12199,59 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5907947933468691510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2800013509931204424} + - component: {fileID: 8755454903872010978} + m_Layer: 0 + m_Name: DebrisNG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2800013509931204424 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907947933468691510} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.45, y: -0.64, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8955885138568379988} + - {fileID: 752280744562233315} + m_Father: {fileID: 6530704449370969801} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8755454903872010978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907947933468691510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 066a41e004f415b4eb74d5e61a2aadbe, type: 3} + m_Name: + m_EditorClassIdentifier: + curveColor: {r: 0, g: 1, b: 0, a: 1} + startPointColor: {r: 1, g: 0, b: 0, a: 1} + endPointColor: {r: 0, g: 0, b: 1, a: 1} + sampling: 25 + keyPoints: + - {fileID: 6434809315840102058} + - {fileID: 9023844645806813366} + normalizedTime: 0.75 --- !u!1 &6007774576877780481 GameObject: m_ObjectHideFlags: 0 @@ -13606,3 +13709,50 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &9074423555571807762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 752280744562233315} + - component: {fileID: 9023844645806813366} + m_Layer: 0 + m_Name: Point 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &752280744562233315 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9074423555571807762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.4470143, y: -5.429279, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2800013509931204424} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &9023844645806813366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9074423555571807762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b0cca3244f403c24f819a870f31cdc29, type: 3} + m_Name: + m_EditorClassIdentifier: + curve: {fileID: 8755454903872010978} + handleType: 0 + leftHandleLocalPosition: {x: -0.08864713, y: 8.091105, z: 0} + rightHandleLocalPosition: {x: 0.08864713, y: -8.091105, z: -0} diff --git a/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab b/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab index b1d79691..2fccaf32 100644 --- a/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab +++ b/Assets/Resources/Prefabs/Games/PajamaParty/Monkey.prefab @@ -693,7 +693,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1.35, y: 1.23} + m_Size: {x: 1.67, y: 1.55} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -970,7 +970,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.37, y: 0.39} + m_Size: {x: 0.69, y: 0.71} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 @@ -1135,7 +1135,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.51, y: 0.51} + m_Size: {x: 0.5, y: 0.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 @@ -1381,7 +1381,7 @@ SpriteRenderer: m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.51, y: 0.51} + m_Size: {x: 0.5, y: 0.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 0 diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat index f46036ed..bf3237f7 100644 --- a/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat +++ b/Assets/Resources/Sprites/Games/KarateMan/karateman_cellshader.mat @@ -82,8 +82,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 1, g: 0.8706616, b: 0.16639495, a: 1} + - _ColorAlpha: {r: 0.84705883, g: 0.8156863, b: 0.6901961, a: 1} - _ColorBravo: {r: 1, g: 0, b: 0, a: 1} - - _ColorDelta: {r: 0.81, g: 0.81, b: 0.81, a: 1} + - _ColorDelta: {r: 0.972549, g: 0.972549, b: 0.972549, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG.meta b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG.meta new file mode 100644 index 00000000..62dd26d7 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27c865861387b11448866a45092797e7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller new file mode 100644 index 00000000..2d31ea56 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-7351194649355570482 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SlideOpen + 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: ae6ea55007552ff4fb8f9e46a07a0b28, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2889309577850128088 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoPose + 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: 154e534281db35940981ad1ccfd850fc, 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: Bg + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8548079407425394027} + 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!1107 &8548079407425394027 +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: -2889309577850128088} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7351194649355570482} + m_Position: {x: 235, y: 65, 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: -2889309577850128088} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller.meta b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller.meta new file mode 100644 index 00000000..bf4a1bea --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eca0332c5e5281c43a8a88a6709ec867 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: ctrpillow/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/NoPose.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/NoPose.anim new file mode 100644 index 00000000..3e22da61 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/NoPose.anim @@ -0,0 +1,53 @@ +%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: NoPose + 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: [] + 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: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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/PajamaParty/Anime/BG/NoPose.anim.meta b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/NoPose.anim.meta new file mode 100644 index 00000000..c4c108a6 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/NoPose.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 154e534281db35940981ad1ccfd850fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: ctrpillow/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/SlideOpen.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/SlideOpen.anim new file mode 100644 index 00000000..ddd05a21 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/SlideOpen.anim @@ -0,0 +1,1449 @@ +%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: SlideOpen + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, 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} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 90} + 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: Paintings/Mid + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, 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} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: -90} + 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: Paintings/RUp + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -90} + 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} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: -202} + 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: Paintings/RDown + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, 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} + - serializedVersion: 3 + time: 1 + value: {x: 0, y: 0, z: 110} + 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: Paintings/Left + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -18, y: 5.5, 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} + - serializedVersion: 3 + time: 1 + value: {x: -36.5, y: 5.5, 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: SlideL + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 18.6, y: 5.5, 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} + - serializedVersion: 3 + time: 1 + value: {x: 36.5, y: 5.5, 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: SlideR + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 10.59, y: 1.75, 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} + - serializedVersion: 3 + time: 1 + value: {x: 30, y: 1.75, 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: Lamp + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -11.766443, y: 0.1434021, z: 186.51025} + 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} + - serializedVersion: 3 + time: 1 + value: {x: -30, y: 12, z: 186.51025} + 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: Paintings/Mid + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -4.867443, y: 3.5134025, z: 186.51025} + 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} + - serializedVersion: 3 + time: 1 + value: {x: 12, y: 12, z: 186.51025} + 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: Paintings/RUp + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -2.32, y: -3.265, z: 186.51025} + 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} + - serializedVersion: 3 + time: 1 + value: {x: 9.79, y: 7.3, z: 186.51025} + 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: Paintings/RDown + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -17.55, y: -3.04, z: 186.51025} + 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} + - serializedVersion: 3 + time: 1 + value: {x: -35.4, y: 5.51, z: 186.51025} + 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: Paintings/Left + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + 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: 151652506 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 4077204985 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 969276760 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1034724018 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1140845437 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3644529298 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 598267945 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1034724018 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1140845437 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3644529298 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 598267945 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -18 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -36.5 + 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: SlideL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 5.5 + 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: SlideL + 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 + - serializedVersion: 3 + time: 1 + 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: SlideL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 18.6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 36.5 + 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: SlideR + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 5.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 5.5 + 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: SlideR + 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 + - serializedVersion: 3 + time: 1 + 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: SlideR + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 10.59 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 30 + 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: Lamp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.75 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1.75 + 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: Lamp + 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 + - serializedVersion: 3 + time: 1 + 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: Lamp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -11.766443 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -30 + 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: Paintings/Mid + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.1434021 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 12 + 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: Paintings/Mid + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 186.51025 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 186.51025 + 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: Paintings/Mid + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.x + path: Paintings/Mid + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.y + path: Paintings/Mid + 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 + - serializedVersion: 3 + time: 1 + value: 90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Paintings/Mid + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4.867443 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 12 + 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: Paintings/RUp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3.5134025 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 12 + 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: Paintings/RUp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 186.51025 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 186.51025 + 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: Paintings/RUp + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.x + path: Paintings/RUp + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.y + path: Paintings/RUp + 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 + - serializedVersion: 3 + time: 1 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Paintings/RUp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.32 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 9.79 + 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: Paintings/RDown + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.265 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 7.3 + 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: Paintings/RDown + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 186.51025 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 186.51025 + 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: Paintings/RDown + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.x + path: Paintings/RDown + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.y + path: Paintings/RDown + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -202 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Paintings/RDown + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -17.55 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -35.4 + 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: Paintings/Left + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.04 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 5.51 + 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: Paintings/Left + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 186.51025 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 186.51025 + 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: Paintings/Left + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.x + path: Paintings/Left + 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 + - serializedVersion: 3 + time: 1 + 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: localEulerAnglesRaw.y + path: Paintings/Left + 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 + - serializedVersion: 3 + time: 1 + value: 110 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Paintings/Left + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Paintings/Mid + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Paintings/Mid + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Paintings/Mid + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Paintings/RUp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Paintings/RUp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Paintings/RUp + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Paintings/RDown + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Paintings/RDown + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Paintings/RDown + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Paintings/Left + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Paintings/Left + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Paintings/Left + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/SlideOpen.anim.meta b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/SlideOpen.anim.meta new file mode 100644 index 00000000..7beba428 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/SlideOpen.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae6ea55007552ff4fb8f9e46a07a0b28 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: ctrpillow/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake.anim index 050c421c..07f00bc5 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyAwake.anim @@ -1039,6 +1039,82 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.91372555 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.r + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9176471 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.g + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.07450981 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.b + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.a + path: LegOther + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -1135,6 +1211,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: LegOther + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1646,6 +1750,62 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 164936018 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 164936018 + attribute: 1304800921 + script: {fileID: 0} + typeID: 212 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 164936018 + attribute: 1573236377 + script: {fileID: 0} + typeID: 212 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 164936018 + attribute: 1841671833 + script: {fileID: 0} + typeID: 212 + customType: 22 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 164936018 + attribute: 2110107289 + script: {fileID: 0} + typeID: 212 + customType: 22 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: -1822500885626475538, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} @@ -1662,6 +1822,10 @@ AnimationClip: - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: -9185421532643117166, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -4340,6 +4504,82 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.91372555 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.r + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9176471 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.g + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.07450981 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.b + path: LegOther + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._ColorAlpha.a + path: LegOther + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyBeat.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyBeat.anim index ea34ffa2..00e00707 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyBeat.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyBeat.anim @@ -1582,6 +1582,27 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -2044,6 +2065,27 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -6583463784047337566, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: -6583463784047337566, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -2071,6 +2113,9 @@ AnimationClip: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump.anim index f2289c88..be79fc86 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump.anim @@ -1214,6 +1214,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1683,6 +1711,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -3809071231913649798, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 2470915716706839050, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -1701,6 +1757,10 @@ AnimationClip: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump02.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump02.anim index 9f7b555a..9dd5f9e6 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump02.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump02.anim @@ -1202,6 +1202,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1678,6 +1706,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: 8140563478415476392, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 2470915716706839050, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -1694,6 +1750,10 @@ AnimationClip: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump03.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump03.anim index df6529c6..489ed60e 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump03.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump03.anim @@ -1218,6 +1218,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1694,6 +1722,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 - serializedVersion: 2 path: 0 attribute: 3 @@ -1717,6 +1773,10 @@ AnimationClip: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyLand.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyLand.anim index 3100af60..489a9f14 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyLand.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyLand.anim @@ -2229,6 +2229,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -2691,6 +2719,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -6583463784047337566, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: -6583463784047337566, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -2731,6 +2787,10 @@ AnimationClip: - {fileID: 3033587694249821955, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReady.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReady.anim index 607462ca..84e37f57 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReady.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReady.anim @@ -1179,6 +1179,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1410,6 +1438,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 - serializedVersion: 2 path: 2172988300 attribute: 1 @@ -1662,6 +1718,10 @@ AnimationClip: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReadySleep.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReadySleep.anim index 1934afc4..eedb22b8 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReadySleep.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyReadySleep.anim @@ -615,7 +615,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.22, z: 0} + value: {x: -0.22, y: 0.11, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -631,7 +631,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1.26, y: -0.2, z: 0} + value: {x: -0.7819548, y: -0.102272734, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -842,7 +842,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 1, z: 1} + value: {x: 1.33, y: 0.88, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -858,7 +858,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.45, y: 1.12, z: 1} + value: {x: 1.0902256, y: 1.2727273, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -1282,6 +1282,44 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.69 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.71 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: Leg + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -1350,7 +1388,7 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 0} + value: {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} attribute: m_Sprite path: Leg classID: 212 @@ -1364,7 +1402,7 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + value: {fileID: 0} attribute: m_Sprite path: LegOther classID: 212 @@ -1376,6 +1414,41 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: LegOther/LegAttatch + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1887,6 +1960,55 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 2439805283 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 4197328169 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1302185647 + attribute: 2368279999 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: -3809071231913649798, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 2470915716706839050, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -1898,10 +2020,15 @@ AnimationClip: - {fileID: -8829037718448610288, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} - {fileID: 0} - - {fileID: 0} + - {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + - {fileID: 0} - {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - - {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -4478,7 +4605,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -0.22 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -4497,7 +4624,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.22 + value: 0.11 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -4592,7 +4719,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.33 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -4611,7 +4738,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.88 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -4668,7 +4795,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.26 + value: -0.7819548 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -4687,7 +4814,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.2 + value: -0.102272734 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -4782,7 +4909,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.45 + value: 1.0902256 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -4801,7 +4928,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.12 + value: 1.2727273 inSlope: Infinity outSlope: Infinity tangentMode: 69 @@ -5309,6 +5436,44 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.69 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.71 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: Leg + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep00.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep00.anim index 8a06a014..5b473d29 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep00.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep00.anim @@ -1276,6 +1276,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1780,6 +1808,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -3809071231913649798, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 2470915716706839050, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -1795,6 +1851,10 @@ AnimationClip: - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep01.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep01.anim index cffd392c..19234efb 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep01.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep01.anim @@ -381,7 +381,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.22, z: 0} + value: {x: -0.22, y: 0.11, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -397,7 +397,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1.26, y: -0.2, z: 0} + value: {x: -0.7819548, y: -0.102272734, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -590,7 +590,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 1, z: 1} + value: {x: 1.33, y: 0.88, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -606,7 +606,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.45, y: 1.12, z: 1} + value: {x: 1.0902256, y: 1.2727273, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -1030,6 +1030,44 @@ AnimationClip: path: ArmL classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.69 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.71 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: Leg + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -1096,7 +1134,7 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 0} + value: {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} attribute: m_Sprite path: Leg classID: 212 @@ -1110,7 +1148,7 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + value: {fileID: 0} attribute: m_Sprite path: LegOther classID: 212 @@ -1122,6 +1160,41 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: LegOther/LegAttatch + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1633,6 +1706,55 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 2439805283 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 4197328169 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1302185647 + attribute: 2368279999 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: -3809071231913649798, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 2470915716706839050, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -1643,10 +1765,15 @@ AnimationClip: - {fileID: 5412048016436018736, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} - {fileID: 0} - - {fileID: 0} + - {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + - {fileID: 0} - {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - - {fileID: 1766318556327879947, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -3448,7 +3575,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -0.22 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3467,7 +3594,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.22 + value: 0.11 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3562,7 +3689,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.33 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3581,7 +3708,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.88 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3638,7 +3765,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.26 + value: -0.7819548 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3657,7 +3784,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.2 + value: -0.102272734 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3752,7 +3879,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.45 + value: 1.0902256 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3771,7 +3898,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.12 + value: 1.2727273 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4298,6 +4425,44 @@ AnimationClip: path: ArmL classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.69 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.71 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: Leg + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -4636,7 +4801,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Leg/LegAttatch + path: LegOther/LegAttatch classID: 4 script: {fileID: 0} - curve: @@ -4646,17 +4811,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Leg/LegAttatch - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Leg/LegAttatch + path: LegOther/LegAttatch classID: 4 script: {fileID: 0} - curve: @@ -4669,6 +4824,16 @@ AnimationClip: path: LegOther/LegAttatch classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Leg/LegAttatch + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -4676,7 +4841,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: LegOther/LegAttatch + path: Leg/LegAttatch classID: 4 script: {fileID: 0} - curve: @@ -4686,7 +4851,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: LegOther/LegAttatch + path: Leg/LegAttatch classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep02.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep02.anim index 18f4c27b..d6f45244 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep02.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep02.anim @@ -172,7 +172,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 88.28} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -188,7 +188,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: -88.28} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -408,7 +408,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0.22, z: 0} + value: {x: 0.19, y: 0.38, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -424,7 +424,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1.26, y: -0.2, z: 0} + value: {x: -0.53781295, y: 1.0130574, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -626,7 +626,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 1, z: 1} + value: {x: 0.75, y: 1.42, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -642,7 +642,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.45, y: 1.12, z: 1} + value: {x: 1.0211267, y: 1.4933333, z: 1} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -919,7 +919,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1014,7 +1014,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1132,7 +1132,7 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: 0} + value: {fileID: -9185421532643117166, guid: 29e676de02a66324c803aef4d162c58e, type: 3} attribute: m_Sprite path: Leg classID: 212 @@ -1146,7 +1146,7 @@ AnimationClip: script: {fileID: 0} - curve: - time: 0 - value: {fileID: -9185421532643117166, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + value: {fileID: 0} attribute: m_Sprite path: LegOther classID: 212 @@ -1158,6 +1158,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1669,6 +1697,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -1822500885626475538, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} @@ -1679,10 +1735,14 @@ AnimationClip: - {fileID: 5412048016436018736, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 914082432521062771, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 914082432521062771, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - - {fileID: 0} - - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: -9185421532643117166, guid: 29e676de02a66324c803aef4d162c58e, type: 3} + - {fileID: 8148159563688161889, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} + - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -3611,7 +3671,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 0.19 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3630,7 +3690,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.22 + value: 0.38 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3706,7 +3766,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 88.28 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3725,7 +3785,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.75 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3744,7 +3804,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.42 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3782,7 +3842,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3801,7 +3861,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.26 + value: -0.53781295 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3820,7 +3880,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.2 + value: 1.0130574 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3896,7 +3956,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -88.28 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3915,7 +3975,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.45 + value: 1.0211267 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3934,7 +3994,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.12 + value: 1.4933333 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4048,7 +4108,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -4719,7 +4779,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x + attribute: m_LocalEulerAngles.z path: Leg classID: 4 script: {fileID: 0} @@ -4739,7 +4799,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z + attribute: m_LocalEulerAngles.x path: Leg classID: 4 script: {fileID: 0} @@ -4749,8 +4809,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Leg/LegAttatch + attribute: m_LocalEulerAngles.z + path: BodyOther classID: 4 script: {fileID: 0} - curve: @@ -4760,7 +4820,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Leg/LegAttatch + path: BodyOther classID: 4 script: {fileID: 0} - curve: @@ -4769,8 +4829,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Leg/LegAttatch + attribute: m_LocalEulerAngles.x + path: BodyOther classID: 4 script: {fileID: 0} - curve: @@ -4810,7 +4870,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: BodyOther + path: Leg/LegAttatch classID: 4 script: {fileID: 0} - curve: @@ -4820,7 +4880,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: BodyOther + path: Leg/LegAttatch classID: 4 script: {fileID: 0} - curve: @@ -4830,7 +4890,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: BodyOther + path: Leg/LegAttatch classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyThrow.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyThrow.anim index 1046ba93..b17d0746 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyThrow.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyThrow.anim @@ -1210,6 +1210,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1714,6 +1742,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -3809071231913649798, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 2470915716706839050, guid: 29e676de02a66324c803aef4d162c58e, type: 3} @@ -1732,6 +1788,10 @@ AnimationClip: - {fileID: 0} - {fileID: 800185268390134627, guid: 29e676de02a66324c803aef4d162c58e, type: 3} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/NoPose.anim b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/NoPose.anim index 2f620cf2..25f12008 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/NoPose.anim +++ b/Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/NoPose.anim @@ -980,6 +980,34 @@ AnimationClip: path: LegOther/LegAttatch classID: 212 script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmR + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Leg + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: ArmL + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + attribute: m_Materials.Array.data[0] + path: Body + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -1169,6 +1197,34 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 11499848 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 1302185647 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4204807211 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2073732236 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 - serializedVersion: 2 path: 130111906 attribute: 1 @@ -1456,6 +1512,10 @@ AnimationClip: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} + - {fileID: 2100000, guid: 0fa3a3dfb8a5a16459786fc00275d76d, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/pillow_half_half.png.meta b/Assets/Resources/Sprites/Games/PajamaParty/pillow_half_half.png.meta index 0a281106..5e25ed71 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/pillow_half_half.png.meta +++ b/Assets/Resources/Sprites/Games/PajamaParty/pillow_half_half.png.meta @@ -142,7 +142,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 244.14062 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -161,7 +161,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -173,7 +173,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -190,16 +190,16 @@ TextureImporter: name: pillow_half_half_0 rect: serializedVersion: 2 - x: 7 - y: 1775 - width: 167 - height: 267 + x: 17.089844 + y: 4333.496 + width: 407.71484 + height: 651.85547 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 8a1ad02525c1ddca0800000000000000 internalID: -5990600789443370584 @@ -211,16 +211,16 @@ TextureImporter: name: pillow_half_half_1 rect: serializedVersion: 2 - x: 199 - y: 1818 - width: 304 - height: 216 + x: 485.83984 + y: 4438.4766 + width: 742.1875 + height: 527.34375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 525a34259f9b74030800000000000000 internalID: 3478953717645157669 @@ -232,16 +232,16 @@ TextureImporter: name: pillow_half_half_2 rect: serializedVersion: 2 - x: 520 - y: 1748 - width: 587 - height: 293 + x: 1269.5312 + y: 4267.578 + width: 1433.1055 + height: 715.33203 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d84e23cd067b11d60800000000000000 internalID: 7859264451377292429 @@ -253,16 +253,16 @@ TextureImporter: name: pillow_half_half_3 rect: serializedVersion: 2 - x: 1186 - y: 1435 - width: 855 - height: 606 + x: 2895.5078 + y: 3503.418 + width: 2087.4023 + height: 1479.4922 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 3966564621c3a9400800000000000000 internalID: 331643572256597651 @@ -274,16 +274,16 @@ TextureImporter: name: pillow_half_half_4 rect: serializedVersion: 2 - x: 32 - y: 1596 - width: 812 - height: 101 + x: 78.125 + y: 3896.4844 + width: 1982.4219 + height: 246.58203 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d9c5ed09a3ef445f0800000000000000 internalID: -773213708508832611 @@ -295,16 +295,16 @@ TextureImporter: name: pillow_half_half_5 rect: serializedVersion: 2 - x: 883 - y: 1659 - width: 46 - height: 50 + x: 2155.7617 + y: 4050.293 + width: 112.30469 + height: 122.07031 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6700087c656964020800000000000000 internalID: 2325711557041848438 @@ -316,16 +316,16 @@ TextureImporter: name: pillow_half_half_6 rect: serializedVersion: 2 - x: 1023 - y: 1574 - width: 70 - height: 87 + x: 2497.5586 + y: 3842.7734 + width: 170.89844 + height: 212.40234 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: f5295def419a28920800000000000000 internalID: 2991139010167280223 @@ -337,16 +337,16 @@ TextureImporter: name: pillow_half_half_8 rect: serializedVersion: 2 - x: 31 - y: 1330 - width: 286 - height: 234 + x: 75.68359 + y: 3247.0703 + width: 698.2422 + height: 571.28906 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 7184c39dfd7682700800000000000000 internalID: 515776368453896215 @@ -358,16 +358,16 @@ TextureImporter: name: pillow_half_half_9 rect: serializedVersion: 2 - x: 371 - y: 1387 - width: 283 - height: 128 + x: 905.7617 + y: 3386.2305 + width: 690.91797 + height: 312.5 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6cbecb771f87f8c00800000000000000 internalID: 905075028616080326 @@ -379,16 +379,16 @@ TextureImporter: name: pillow_half_half_10 rect: serializedVersion: 2 - x: 736 - y: 1326 - width: 208 - height: 226 + x: 1796.875 + y: 3237.3047 + width: 507.8125 + height: 551.7578 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: ada7c67d0589439c0800000000000000 internalID: -3948363500318065958 @@ -400,16 +400,16 @@ TextureImporter: name: pillow_half_half_11 rect: serializedVersion: 2 - x: 1023 - y: 1446 - width: 71 - height: 87 + x: 2497.5586 + y: 3530.2734 + width: 173.33984 + height: 212.40234 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 35649072311a27e90800000000000000 internalID: -7029378964740553133 @@ -421,16 +421,16 @@ TextureImporter: name: pillow_half_half_13 rect: serializedVersion: 2 - x: 1026 - y: 1307 - width: 68 - height: 87 + x: 2504.8828 + y: 3190.918 + width: 166.01562 + height: 212.40234 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 644c787134f38d9d0800000000000000 internalID: -2749378015119555514 @@ -442,16 +442,16 @@ TextureImporter: name: pillow_half_half_14 rect: serializedVersion: 2 - x: 1151 - y: 750 - width: 251 - height: 659 + x: 2810.0586 + y: 1831.0547 + width: 612.79297 + height: 1608.8867 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d405f5ea7eff58620800000000000000 internalID: 2775906115871789133 @@ -463,16 +463,16 @@ TextureImporter: name: pillow_half_half_15 rect: serializedVersion: 2 - x: 1467 - y: 563 - width: 574 - height: 842 + x: 3581.543 + y: 1374.5117 + width: 1401.3672 + height: 2055.664 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 9aabecbbacf83f280800000000000000 internalID: -9010700328541177175 @@ -484,16 +484,16 @@ TextureImporter: name: pillow_half_half_16 rect: serializedVersion: 2 - x: 15 - y: 1054 - width: 882 - height: 255 + x: 36.621094 + y: 2573.2422 + width: 2153.3203 + height: 622.5586 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 15c7850135e94e560800000000000000 internalID: 7342167372114459729 @@ -505,16 +505,16 @@ TextureImporter: name: pillow_half_half_18 rect: serializedVersion: 2 - x: 959 - y: 1227 - width: 36 - height: 37 + x: 2341.3086 + y: 2995.6055 + width: 87.890625 + height: 90.33203 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 3ddcec6a4bf010d90800000000000000 internalID: -7133403066211054125 @@ -526,16 +526,16 @@ TextureImporter: name: pillow_half_half_19 rect: serializedVersion: 2 - x: 1039 - y: 1223 - width: 31 - height: 42 + x: 2536.621 + y: 2985.8398 + width: 75.68359 + height: 102.53906 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 74fc32096f1ef65c0800000000000000 internalID: -4219905876726395065 @@ -547,16 +547,16 @@ TextureImporter: name: pillow_half_half_20 rect: serializedVersion: 2 - x: 957 - y: 1143 - width: 30 - height: 32 + x: 2336.4258 + y: 2790.5273 + width: 73.24219 + height: 78.125 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 71f626694f1829400800000000000000 internalID: 329468610246504215 @@ -568,16 +568,16 @@ TextureImporter: name: pillow_half_half_21 rect: serializedVersion: 2 - x: 1038 - y: 1144 - width: 39 - height: 38 + x: 2534.1797 + y: 2792.9688 + width: 95.21484 + height: 92.77344 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 89dc47212066cb740800000000000000 internalID: 5169118631400099224 @@ -589,16 +589,16 @@ TextureImporter: name: pillow_half_half_22 rect: serializedVersion: 2 - x: 11 - y: 262 - width: 674 - height: 763 + x: 26.855469 + y: 639.64844 + width: 1645.5078 + height: 1862.793 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 5e99e78381572d8f0800000000000000 internalID: -517222260306699803 @@ -610,16 +610,16 @@ TextureImporter: name: pillow_half_half_23 rect: serializedVersion: 2 - x: 725 - y: 403 - width: 314 - height: 579 + x: 1770.0195 + y: 983.8867 + width: 766.60156 + height: 1413.5742 alignment: 2 pivot: {x: 0.5, y: 1} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 35e007e26f873af70800000000000000 internalID: 9197327862757068371 @@ -631,16 +631,16 @@ TextureImporter: name: pillow_half_half_24 rect: serializedVersion: 2 - x: 1152 - y: 507 - width: 266 - height: 185 + x: 2812.5 + y: 1237.793 + width: 649.41406 + height: 451.66016 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d069ae6248ecc56f0800000000000000 internalID: -694453175537986035 @@ -652,16 +652,16 @@ TextureImporter: name: pillow_half_half_25 rect: serializedVersion: 2 - x: 1137 - y: 363 - width: 876 - height: 92 + x: 2775.879 + y: 886.23047 + width: 2138.6719 + height: 224.60938 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: e20845511f6d196c0800000000000000 internalID: -4138290251643453394 @@ -673,16 +673,16 @@ TextureImporter: name: pillow_half_half_26 rect: serializedVersion: 2 - x: 8 - y: 156 - width: 157 - height: 93 + x: 19.53125 + y: 380.85938 + width: 383.30078 + height: 227.05078 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: f01b0745549768830800000000000000 internalID: 4073076251679568143 @@ -694,16 +694,16 @@ TextureImporter: name: pillow_half_half_27 rect: serializedVersion: 2 - x: 184 - y: 163 - width: 113 - height: 78 + x: 449.21875 + y: 397.94922 + width: 275.8789 + height: 190.42969 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 8815a01f1a8d832f0800000000000000 internalID: -992805527789874808 @@ -715,16 +715,16 @@ TextureImporter: name: pillow_half_half_28 rect: serializedVersion: 2 - x: 342 - y: 22 - width: 84 - height: 211 + x: 834.96094 + y: 53.710938 + width: 205.07812 + height: 515.1367 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: ee29c20cb03fcd7c0800000000000000 internalID: -4045091133491211538 @@ -736,16 +736,16 @@ TextureImporter: name: pillow_half_half_29 rect: serializedVersion: 2 - x: 595 - y: 6 - width: 147 - height: 188 + x: 1452.6367 + y: 14.6484375 + width: 358.88672 + height: 458.98438 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6841488ed5b5e7a00800000000000000 internalID: 756142246335878278 @@ -757,16 +757,16 @@ TextureImporter: name: pillow_half_half_30 rect: serializedVersion: 2 - x: 758 - y: 6 - width: 323 - height: 307 + x: 1850.5859 + y: 14.6484375 + width: 788.5742 + height: 749.5117 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 88286c0482aab7210800000000000000 internalID: 1331845204680278664 @@ -778,16 +778,16 @@ TextureImporter: name: pillow_half_half_31 rect: serializedVersion: 2 - x: 1097 - y: 7 - width: 944 - height: 342 + x: 2678.2227 + y: 17.089844 + width: 2304.6875 + height: 834.96094 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 0ddf9231abc78a030800000000000000 internalID: 3506189448535211472 diff --git a/Assets/Resources/Sprites/Games/PajamaParty/pillow_obj.png.meta b/Assets/Resources/Sprites/Games/PajamaParty/pillow_obj.png.meta index db119f0c..c2c309c4 100644 --- a/Assets/Resources/Sprites/Games/PajamaParty/pillow_obj.png.meta +++ b/Assets/Resources/Sprites/Games/PajamaParty/pillow_obj.png.meta @@ -313,7 +313,7 @@ TextureImporter: spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 244.14062 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 @@ -332,7 +332,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -344,7 +344,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -361,10 +361,10 @@ TextureImporter: name: pillow_obj_0 rect: serializedVersion: 2 - x: 125 - y: 1916 - width: 148 - height: 117 + x: 305.17578 + y: 4677.7344 + width: 361.32812 + height: 285.64453 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -382,10 +382,10 @@ TextureImporter: name: pillow_obj_1 rect: serializedVersion: 2 - x: 298 - y: 1961 - width: 139 - height: 78 + x: 727.53906 + y: 4787.5977 + width: 339.35547 + height: 190.42969 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -403,10 +403,10 @@ TextureImporter: name: pillow_obj_2 rect: serializedVersion: 2 - x: 467 - y: 1871 - width: 138 - height: 154 + x: 1140.1367 + y: 4567.871 + width: 336.91406 + height: 375.97656 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -424,10 +424,10 @@ TextureImporter: name: pillow_obj_3 rect: serializedVersion: 2 - x: 23 - y: 1683 - width: 132 - height: 186 + x: 56.152344 + y: 4108.8867 + width: 322.26562 + height: 454.10156 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -445,10 +445,10 @@ TextureImporter: name: pillow_obj_4 rect: serializedVersion: 2 - x: 194 - y: 1778 - width: 108 - height: 92 + x: 473.6328 + y: 4340.8203 + width: 263.67188 + height: 224.60938 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -466,10 +466,10 @@ TextureImporter: name: pillow_obj_5 rect: serializedVersion: 2 - x: 342 - y: 1771 - width: 83 - height: 99 + x: 834.96094 + y: 4323.7305 + width: 202.63672 + height: 241.69922 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -487,10 +487,10 @@ TextureImporter: name: pillow_obj_6 rect: serializedVersion: 2 - x: 194 - y: 1575 - width: 139 - height: 164 + x: 473.6328 + y: 3845.2148 + width: 339.35547 + height: 400.39062 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -508,10 +508,10 @@ TextureImporter: name: pillow_obj_7 rect: serializedVersion: 2 - x: 470 - y: 1681 - width: 179 - height: 160 + x: 1147.4609 + y: 4104.004 + width: 437.01172 + height: 390.625 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -529,10 +529,10 @@ TextureImporter: name: pillow_obj_8 rect: serializedVersion: 2 - x: 470 - y: 1529 - width: 200 - height: 120 + x: 1147.4609 + y: 3732.9102 + width: 488.28125 + height: 292.96875 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -550,10 +550,10 @@ TextureImporter: name: pillow_obj_9 rect: serializedVersion: 2 - x: 470 - y: 1413 - width: 67 - height: 64 + x: 1147.4609 + y: 3449.707 + width: 163.57422 + height: 156.25 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -571,10 +571,10 @@ TextureImporter: name: pillow_obj_10 rect: serializedVersion: 2 - x: 592 - y: 1419 - width: 49 - height: 59 + x: 1445.3125 + y: 3464.3555 + width: 119.62891 + height: 144.04297 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -592,10 +592,10 @@ TextureImporter: name: pillow_obj_11 rect: serializedVersion: 2 - x: 692 - y: 1415 - width: 85 - height: 67 + x: 1689.4531 + y: 3454.5898 + width: 207.51953 + height: 163.57422 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -613,10 +613,10 @@ TextureImporter: name: pillow_obj_12 rect: serializedVersion: 2 - x: 822 - y: 1402 - width: 63 - height: 92 + x: 2006.8359 + y: 3422.8516 + width: 153.8086 + height: 224.60938 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -634,10 +634,10 @@ TextureImporter: name: pillow_obj_13 rect: serializedVersion: 2 - x: 941 - y: 1411 - width: 56 - height: 74 + x: 2297.3633 + y: 3444.8242 + width: 136.71875 + height: 180.66406 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -655,10 +655,10 @@ TextureImporter: name: pillow_obj_14 rect: serializedVersion: 2 - x: 1048 - y: 1415 - width: 89 - height: 169 + x: 2558.5938 + y: 3454.5898 + width: 217.28516 + height: 412.59766 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -676,10 +676,10 @@ TextureImporter: name: pillow_obj_15 rect: serializedVersion: 2 - x: 707 - y: 1570 - width: 88 - height: 156 + x: 1726.0742 + y: 3833.0078 + width: 214.84375 + height: 380.85938 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -697,10 +697,10 @@ TextureImporter: name: pillow_obj_16 rect: serializedVersion: 2 - x: 840 - y: 1631 - width: 274 - height: 86 + x: 2050.7812 + y: 3981.9336 + width: 668.9453 + height: 209.96094 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -718,10 +718,10 @@ TextureImporter: name: pillow_obj_17 rect: serializedVersion: 2 - x: 1157 - y: 1615 - width: 216 - height: 113 + x: 2824.707 + y: 3942.871 + width: 527.34375 + height: 275.8789 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -739,10 +739,10 @@ TextureImporter: name: pillow_obj_18 rect: serializedVersion: 2 - x: 1407 - y: 1515 - width: 162 - height: 214 + x: 3435.0586 + y: 3698.7305 + width: 395.5078 + height: 522.46094 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -760,13 +760,13 @@ TextureImporter: name: pillow_obj_19 rect: serializedVersion: 2 - x: 706 - y: 1774 - width: 107 - height: 235 + x: 1724 + y: 4325 + width: 261 + height: 580 alignment: 2 pivot: {x: 0.5, y: 1} - border: {x: 0, y: 0, z: 0, w: 170} + border: {x: 0, y: 0, z: 0, w: 415} outline: [] physicsShape: [] tessellationDetail: -1 @@ -781,13 +781,13 @@ TextureImporter: name: pillow_obj_20 rect: serializedVersion: 2 - x: 884 - y: 1774 - width: 106 - height: 227 + x: 2158 + y: 4325 + width: 259 + height: 560 alignment: 2 pivot: {x: 0.5, y: 1} - border: {x: 0, y: 0, z: 0, w: 162} + border: {x: 0, y: 0, z: 0, w: 396} outline: [] physicsShape: [] tessellationDetail: -1 @@ -802,13 +802,13 @@ TextureImporter: name: pillow_obj_21 rect: serializedVersion: 2 - x: 1058 - y: 1774 - width: 107 - height: 235 + x: 2583 + y: 4325 + width: 261 + height: 580 alignment: 2 pivot: {x: 0.5, y: 1} - border: {x: 0, y: 0, z: 0, w: 170} + border: {x: 0, y: 0, z: 0, w: 415} outline: [] physicsShape: [] tessellationDetail: -1 @@ -823,10 +823,10 @@ TextureImporter: name: pillow_obj_22 rect: serializedVersion: 2 - x: 1220 - y: 1884 - width: 137 - height: 139 + x: 2978.5156 + y: 4599.6094 + width: 334.47266 + height: 339.35547 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -844,10 +844,10 @@ TextureImporter: name: pillow_obj_23 rect: serializedVersion: 2 - x: 1395 - y: 1883 - width: 136 - height: 136 + x: 3405.7617 + y: 4597.168 + width: 332.03125 + height: 332.03125 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -865,10 +865,10 @@ TextureImporter: name: pillow_obj_24 rect: serializedVersion: 2 - x: 1633 - y: 1923 - width: 136 - height: 76 + x: 3986.8164 + y: 4694.824 + width: 332.03125 + height: 185.54688 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -886,10 +886,10 @@ TextureImporter: name: pillow_obj_25 rect: serializedVersion: 2 - x: 1627 - y: 1817 - width: 127 - height: 66 + x: 3972.168 + y: 4436.035 + width: 310.0586 + height: 161.13281 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -907,10 +907,10 @@ TextureImporter: name: pillow_obj_26 rect: serializedVersion: 2 - x: 1813 - y: 1923 - width: 156 - height: 78 + x: 4426.2695 + y: 4694.824 + width: 380.85938 + height: 190.42969 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -928,10 +928,10 @@ TextureImporter: name: pillow_obj_27 rect: serializedVersion: 2 - x: 1815 - y: 1785 - width: 158 - height: 71 + x: 4431.1523 + y: 4357.91 + width: 385.7422 + height: 173.33984 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -949,10 +949,10 @@ TextureImporter: name: pillow_obj_28 rect: serializedVersion: 2 - x: 1821 - y: 1669 - width: 150 - height: 70 + x: 4445.801 + y: 4074.707 + width: 366.21094 + height: 170.89844 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -970,10 +970,10 @@ TextureImporter: name: pillow_obj_29 rect: serializedVersion: 2 - x: 1740 - y: 1514 - width: 94 - height: 80 + x: 4248.047 + y: 3696.289 + width: 229.49219 + height: 195.3125 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -991,10 +991,10 @@ TextureImporter: name: pillow_obj_30 rect: serializedVersion: 2 - x: 1891 - y: 1494 - width: 138 - height: 154 + x: 4616.699 + y: 3647.461 + width: 336.91406 + height: 375.97656 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1012,10 +1012,10 @@ TextureImporter: name: pillow_obj_31 rect: serializedVersion: 2 - x: 1874 - y: 1307 - width: 60 - height: 54 + x: 4575.1953 + y: 3190.918 + width: 146.48438 + height: 131.83594 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1033,10 +1033,10 @@ TextureImporter: name: pillow_obj_32 rect: serializedVersion: 2 - x: 1703 - y: 1199 - width: 138 - height: 171 + x: 4157.715 + y: 2927.246 + width: 336.91406 + height: 417.48047 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1054,10 +1054,10 @@ TextureImporter: name: pillow_obj_33 rect: serializedVersion: 2 - x: 1891 - y: 1104 - width: 138 - height: 153 + x: 4616.699 + y: 2695.3125 + width: 336.91406 + height: 373.53516 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1075,10 +1075,10 @@ TextureImporter: name: pillow_obj_34 rect: serializedVersion: 2 - x: 1703 - y: 991 - width: 138 - height: 171 + x: 4157.715 + y: 2419.4336 + width: 336.91406 + height: 417.48047 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1096,10 +1096,10 @@ TextureImporter: name: pillow_obj_35 rect: serializedVersion: 2 - x: 1702 - y: 783 - width: 136 - height: 170 + x: 4155.2734 + y: 1911.6211 + width: 332.03125 + height: 415.03906 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1117,10 +1117,10 @@ TextureImporter: name: pillow_obj_36 rect: serializedVersion: 2 - x: 1873 - y: 747 - width: 148 - height: 325 + x: 4572.754 + y: 1823.7305 + width: 361.32812 + height: 793.45703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1138,10 +1138,10 @@ TextureImporter: name: pillow_obj_37 rect: serializedVersion: 2 - x: 1873 - y: 379 - width: 149 - height: 325 + x: 4572.754 + y: 925.29297 + width: 363.76953 + height: 793.45703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1159,13 +1159,13 @@ TextureImporter: name: pillow_obj_38 rect: serializedVersion: 2 - x: 1731 - y: 607 - width: 75 - height: 127 + x: 4226.074 + y: 1481.9336 + width: 183.10547 + height: 310.0586 alignment: 2 pivot: {x: 0.5, y: 1} - border: {x: 0, y: 0, z: 0, w: 80} + border: {x: 0, y: 0, z: 0, w: 195.3125} outline: [] physicsShape: [] tessellationDetail: -1 @@ -1180,10 +1180,10 @@ TextureImporter: name: pillow_obj_39 rect: serializedVersion: 2 - x: 1726 - y: 498 - width: 89 - height: 59 + x: 4213.867 + y: 1215.8203 + width: 217.28516 + height: 144.04297 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1201,10 +1201,10 @@ TextureImporter: name: pillow_obj_40 rect: serializedVersion: 2 - x: 1695 - y: 367 - width: 146 - height: 87 + x: 4138.1836 + y: 895.9961 + width: 356.4453 + height: 212.40234 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1222,10 +1222,10 @@ TextureImporter: name: pillow_obj_41 rect: serializedVersion: 2 - x: 1530 - y: 639 - width: 135 - height: 166 + x: 3735.3516 + y: 1560.0586 + width: 329.58984 + height: 405.27344 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1243,10 +1243,10 @@ TextureImporter: name: pillow_obj_42 rect: serializedVersion: 2 - x: 1407 - y: 639 - width: 82 - height: 63 + x: 3435.0586 + y: 1560.0586 + width: 200.19531 + height: 153.8086 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1264,10 +1264,10 @@ TextureImporter: name: pillow_obj_43 rect: serializedVersion: 2 - x: 1390 - y: 431 - width: 163 - height: 178 + x: 3393.5547 + y: 1052.2461 + width: 397.94922 + height: 434.5703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1285,10 +1285,10 @@ TextureImporter: name: pillow_obj_44 rect: serializedVersion: 2 - x: 1583 - y: 367 - width: 82 - height: 239 + x: 3864.746 + y: 895.9961 + width: 200.19531 + height: 583.4961 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1306,10 +1306,10 @@ TextureImporter: name: pillow_obj_45 rect: serializedVersion: 2 - x: 1171 - y: 1223 - width: 126 - height: 155 + x: 2858.8867 + y: 2985.8398 + width: 307.6172 + height: 378.41797 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1327,10 +1327,10 @@ TextureImporter: name: pillow_obj_46 rect: serializedVersion: 2 - x: 1171 - y: 1039 - width: 142 - height: 146 + x: 2858.8867 + y: 2536.621 + width: 346.6797 + height: 356.4453 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1348,10 +1348,10 @@ TextureImporter: name: pillow_obj_47 rect: serializedVersion: 2 - x: 1363 - y: 1099 - width: 138 - height: 276 + x: 3327.6367 + y: 2683.1055 + width: 336.91406 + height: 673.8281 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1369,10 +1369,10 @@ TextureImporter: name: pillow_obj_48 rect: serializedVersion: 2 - x: 1361 - y: 942 - width: 156 - height: 115 + x: 3322.754 + y: 2299.8047 + width: 380.85938 + height: 280.76172 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1390,10 +1390,10 @@ TextureImporter: name: pillow_obj_49 rect: serializedVersion: 2 - x: 784 - y: 1051 - width: 150 - height: 325 + x: 1914.0625 + y: 2565.918 + width: 366.21094 + height: 793.45703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1411,10 +1411,10 @@ TextureImporter: name: pillow_obj_50 rect: serializedVersion: 2 - x: 976 - y: 1051 - width: 150 - height: 325 + x: 2382.8125 + y: 2565.918 + width: 366.21094 + height: 793.45703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1432,10 +1432,10 @@ TextureImporter: name: pillow_obj_51 rect: serializedVersion: 2 - x: 960 - y: 848 - width: 115 - height: 152 + x: 2343.75 + y: 2070.3125 + width: 280.76172 + height: 371.09375 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1453,10 +1453,10 @@ TextureImporter: name: pillow_obj_52 rect: serializedVersion: 2 - x: 789 - y: 934 - width: 69 - height: 69 + x: 1926.2695 + y: 2280.2734 + width: 168.45703 + height: 168.45703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1474,10 +1474,10 @@ TextureImporter: name: pillow_obj_53 rect: serializedVersion: 2 - x: 788 - y: 739 - width: 129 - height: 123 + x: 1923.8281 + y: 1804.1992 + width: 314.9414 + height: 300.29297 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1495,10 +1495,10 @@ TextureImporter: name: pillow_obj_54 rect: serializedVersion: 2 - x: 19 - y: 1191 - width: 339 - height: 184 + x: 46.38672 + y: 2907.7148 + width: 827.6367 + height: 449.21875 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1516,10 +1516,10 @@ TextureImporter: name: pillow_obj_55 rect: serializedVersion: 2 - x: 19 - y: 965 - width: 339 - height: 186 + x: 46.38672 + y: 2355.957 + width: 827.6367 + height: 454.10156 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1537,10 +1537,10 @@ TextureImporter: name: pillow_obj_56 rect: serializedVersion: 2 - x: 19 - y: 739 - width: 339 - height: 188 + x: 46.38672 + y: 1804.1992 + width: 827.6367 + height: 458.98438 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1558,10 +1558,10 @@ TextureImporter: name: pillow_obj_57 rect: serializedVersion: 2 - x: 18 - y: 511 - width: 340 - height: 194 + x: 43.945312 + y: 1247.5586 + width: 830.0781 + height: 473.6328 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1579,10 +1579,10 @@ TextureImporter: name: pillow_obj_58 rect: serializedVersion: 2 - x: 18 - y: 286 - width: 339 - height: 195 + x: 43.945312 + y: 698.2422 + width: 827.6367 + height: 476.07422 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1600,10 +1600,10 @@ TextureImporter: name: pillow_obj_59 rect: serializedVersion: 2 - x: 402 - y: 1182 - width: 343 - height: 195 + x: 981.4453 + y: 2885.7422 + width: 837.40234 + height: 476.07422 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1621,10 +1621,10 @@ TextureImporter: name: pillow_obj_60 rect: serializedVersion: 2 - x: 402 - y: 957 - width: 343 - height: 195 + x: 981.4453 + y: 2336.4258 + width: 837.40234 + height: 476.07422 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1642,10 +1642,10 @@ TextureImporter: name: pillow_obj_61 rect: serializedVersion: 2 - x: 403 - y: 734 - width: 342 - height: 194 + x: 983.8867 + y: 1791.9922 + width: 834.96094 + height: 473.6328 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1663,10 +1663,10 @@ TextureImporter: name: pillow_obj_62 rect: serializedVersion: 2 - x: 401 - y: 532 - width: 417 - height: 169 + x: 979.0039 + y: 1298.8281 + width: 1018.0664 + height: 412.59766 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1684,10 +1684,10 @@ TextureImporter: name: pillow_obj_63 rect: serializedVersion: 2 - x: 400 - y: 318 - width: 418 - height: 145 + x: 976.5625 + y: 776.3672 + width: 1020.5078 + height: 354.0039 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1705,10 +1705,10 @@ TextureImporter: name: pillow_obj_64 rect: serializedVersion: 2 - x: 865 - y: 510 - width: 341 - height: 194 + x: 2111.8164 + y: 1245.1172 + width: 832.51953 + height: 473.6328 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1726,10 +1726,10 @@ TextureImporter: name: pillow_obj_65 rect: serializedVersion: 2 - x: 1428 - y: 18 - width: 87 - height: 379 + x: 3486.3281 + y: 43.945312 + width: 212.40234 + height: 925.29297 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1747,10 +1747,10 @@ TextureImporter: name: pillow_obj_66 rect: serializedVersion: 2 - x: 22 - y: 118 - width: 180 - height: 138 + x: 53.710938 + y: 288.08594 + width: 439.45312 + height: 336.91406 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1768,10 +1768,10 @@ TextureImporter: name: pillow_obj_67 rect: serializedVersion: 2 - x: 245 - y: 110 - width: 180 - height: 146 + x: 598.14453 + y: 268.5547 + width: 439.45312 + height: 356.4453 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1789,10 +1789,10 @@ TextureImporter: name: pillow_obj_68 rect: serializedVersion: 2 - x: 468 - y: 115 - width: 181 - height: 132 + x: 1142.5781 + y: 280.76172 + width: 441.89453 + height: 322.26562 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1810,10 +1810,10 @@ TextureImporter: name: pillow_obj_69 rect: serializedVersion: 2 - x: 694 - y: 98 - width: 167 - height: 155 + x: 1694.3359 + y: 239.25781 + width: 407.71484 + height: 378.41797 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1831,10 +1831,10 @@ TextureImporter: name: pillow_obj_70 rect: serializedVersion: 2 - x: 735 - y: 14 - width: 51 - height: 51 + x: 1794.4336 + y: 34.179688 + width: 124.51172 + height: 124.51172 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1852,10 +1852,10 @@ TextureImporter: name: pillow_obj_71 rect: serializedVersion: 2 - x: 815 - y: 14 - width: 50 - height: 50 + x: 1989.7461 + y: 34.179688 + width: 122.07031 + height: 122.07031 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1873,10 +1873,10 @@ TextureImporter: name: pillow_obj_72 rect: serializedVersion: 2 - x: 899 - y: 15 - width: 153 - height: 79 + x: 2194.8242 + y: 36.621094 + width: 373.53516 + height: 192.8711 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1894,10 +1894,10 @@ TextureImporter: name: pillow_obj_73 rect: serializedVersion: 2 - x: 1091 - y: 18 - width: 185 - height: 79 + x: 2663.5742 + y: 43.945312 + width: 451.66016 + height: 192.8711 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1915,10 +1915,10 @@ TextureImporter: name: pillow_obj_74 rect: serializedVersion: 2 - x: 1317 - y: 19 - width: 69 - height: 71 + x: 3215.332 + y: 46.38672 + width: 168.45703 + height: 173.33984 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1936,10 +1936,10 @@ TextureImporter: name: pillow_obj_75 rect: serializedVersion: 2 - x: 1286 - y: 131 - width: 71 - height: 97 + x: 3139.6484 + y: 319.82422 + width: 173.33984 + height: 236.8164 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1957,10 +1957,10 @@ TextureImporter: name: pillow_obj_76 rect: serializedVersion: 2 - x: 1174 - y: 131 - width: 67 - height: 71 + x: 2866.211 + y: 319.82422 + width: 163.57422 + height: 173.33984 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1978,10 +1978,10 @@ TextureImporter: name: pillow_obj_77 rect: serializedVersion: 2 - x: 1074 - y: 130 - width: 60 - height: 60 + x: 2622.0703 + y: 317.3828 + width: 146.48438 + height: 146.48438 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -1999,10 +1999,10 @@ TextureImporter: name: pillow_obj_78 rect: serializedVersion: 2 - x: 902 - y: 127 - width: 132 - height: 127 + x: 2202.1484 + y: 310.0586 + width: 322.26562 + height: 310.0586 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2020,10 +2020,10 @@ TextureImporter: name: pillow_obj_79 rect: serializedVersion: 2 - x: 1558 - y: 18 - width: 180 - height: 140 + x: 3803.711 + y: 43.945312 + width: 439.45312 + height: 341.79688 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2041,10 +2041,10 @@ TextureImporter: name: pillow_obj_80 rect: serializedVersion: 2 - x: 1782 - y: 23 - width: 180 - height: 135 + x: 4350.586 + y: 56.152344 + width: 439.45312 + height: 329.58984 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2062,10 +2062,10 @@ TextureImporter: name: pillow_obj_81 rect: serializedVersion: 2 - x: 1839 - y: 209 - width: 126 - height: 96 + x: 4489.746 + y: 510.2539 + width: 307.6172 + height: 234.375 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2083,10 +2083,10 @@ TextureImporter: name: pillow_obj_82 rect: serializedVersion: 2 - x: 1694 - y: 207 - width: 116 - height: 111 + x: 4135.742 + y: 505.3711 + width: 283.20312 + height: 270.9961 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2104,10 +2104,10 @@ TextureImporter: name: pillow_obj_83 rect: serializedVersion: 2 - x: 1554 - y: 194 - width: 106 - height: 133 + x: 3793.9453 + y: 473.6328 + width: 258.78906 + height: 324.70703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2125,10 +2125,10 @@ TextureImporter: name: pillow_obj_84 rect: serializedVersion: 2 - x: 1267 - y: 273 - width: 91 - height: 133 + x: 3093.2617 + y: 666.5039 + width: 222.16797 + height: 324.70703 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2146,10 +2146,10 @@ TextureImporter: name: pillow_obj_85 rect: serializedVersion: 2 - x: 1127 - y: 287 - width: 114 - height: 127 + x: 2751.4648 + y: 700.6836 + width: 278.3203 + height: 310.0586 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2167,10 +2167,10 @@ TextureImporter: name: pillow_obj_86 rect: serializedVersion: 2 - x: 996 - y: 287 - width: 121 - height: 125 + x: 2431.6406 + y: 700.6836 + width: 295.41016 + height: 305.17578 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2188,10 +2188,10 @@ TextureImporter: name: pillow_obj_87 rect: serializedVersion: 2 - x: 855 - y: 287 - width: 128 - height: 125 + x: 2087.4023 + y: 700.6836 + width: 312.5 + height: 305.17578 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -2209,10 +2209,10 @@ TextureImporter: name: pillow_obj_88 rect: serializedVersion: 2 - x: 1251 - y: 454 - width: 71 - height: 104 + x: 3054.1992 + y: 1108.3984 + width: 173.33984 + height: 253.90625 alignment: 9 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Resources/Sprites/Games/PajamaParty/pillow_obj02.png.meta b/Assets/Resources/Sprites/Games/PajamaParty/pillow_obj02.png.meta new file mode 100644 index 00000000..69c95236 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/pillow_obj02.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 86b126de2a1302e48b1e31891245b494 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: ctrpillow/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/PajamaParty/pillow_objMapped.mat b/Assets/Resources/Sprites/Games/PajamaParty/pillow_objMapped.mat new file mode 100644 index 00000000..3c143019 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/pillow_objMapped.mat @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pillow_objMapped + m_Shader: {fileID: 4800000, guid: af40ea27225ac294189e15c2851fcc90, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _AddColor: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorAlpha: {r: 0.91372555, g: 0.9176471, b: 0.07450981, a: 1} + - _ColorBravo: {r: 1, g: 0.8117648, b: 0.70980394, a: 1} + - _ColorDelta: {r: 0.6666667, g: 0.9843138, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/PajamaParty/pillow_objMapped.mat.meta b/Assets/Resources/Sprites/Games/PajamaParty/pillow_objMapped.mat.meta new file mode 100644 index 00000000..ded01ee5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/PajamaParty/pillow_objMapped.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fa3a3dfb8a5a16459786fc00275d76d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: ctrpillow/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim index 774420d3..4f4926a5 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Launcher/Launch.anim @@ -113,7 +113,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.06, y: 0.16, z: 0} + value: {x: 0.02, y: 0.17, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -122,7 +122,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: 0.04, y: 0.16, z: 0} + value: {x: 0.04, y: 0.17, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -131,7 +131,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: 0.06, y: 0.16, z: 0} + value: {x: 0.02, y: 0.17, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -140,7 +140,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0.04, y: 0.16, z: 0} + value: {x: -0.01, y: 0.15, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -558,7 +558,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.06 + value: 0.02 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -576,7 +576,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.06 + value: 0.02 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -585,7 +585,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.04 + value: -0.01 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -613,7 +613,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.16 + value: 0.17 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -622,7 +622,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: 0.16 + value: 0.17 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -631,7 +631,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.16 + value: 0.17 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -640,7 +640,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.16 + value: 0.15 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta index 89d1e57e..f7ba3d5a 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_bg.png.meta @@ -106,7 +106,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -125,7 +125,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -137,7 +137,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -154,16 +154,16 @@ TextureImporter: name: wall rect: serializedVersion: 2 - x: 0 - y: 1696 - width: 2272 - height: 524 + x: 218 + y: 3061 + width: 4539 + height: 1031 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 8751e9733534ac5a0800000000000000 internalID: -6500309087461436040 @@ -175,16 +175,16 @@ TextureImporter: name: tile rect: serializedVersion: 2 - x: 575 - y: 1207 - width: 2173 - height: 135 + x: 195 + y: 4310 + width: 5513 + height: 330 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 7d318bea3f7e718b0800000000000000 internalID: -5181417812472097833 @@ -196,16 +196,16 @@ TextureImporter: name: tree rect: serializedVersion: 2 - x: 1998 - y: 19 - width: 501 - height: 1005 + x: 196 + y: 739 + width: 1058 + height: 2136 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 7dfa0c43af89c41f0800000000000000 internalID: -1059303611944620073 @@ -217,16 +217,16 @@ TextureImporter: name: treeBranch rect: serializedVersion: 2 - x: 548 - y: 468 - width: 220 - height: 327 + x: 1615 + y: 850 + width: 864 + height: 1339 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 2e65b454632fabc00800000000000000 internalID: 917311789028038370 @@ -238,16 +238,16 @@ TextureImporter: name: leaf00 rect: serializedVersion: 2 - x: 1053 - y: 553 - width: 498 - height: 254 + x: 3059 + y: 904 + width: 1369 + height: 690 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c9a47a2ec7003b790800000000000000 internalID: -7515662816772666724 @@ -259,16 +259,16 @@ TextureImporter: name: leaf01 rect: serializedVersion: 2 - x: 1041 - y: 45 - width: 498 - height: 254 + x: 4781 + y: 852 + width: 598 + height: 305 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c64ba8e649e518190800000000000000 internalID: -7961978674611571604 @@ -280,16 +280,16 @@ TextureImporter: name: leaf02 rect: serializedVersion: 2 - x: 424 - y: 45 - width: 498 - height: 254 + x: 4860 + y: 464 + width: 598 + height: 305 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: bf7e4c7ff7714e800800000000000000 internalID: 640662885378615291 @@ -301,16 +301,16 @@ TextureImporter: name: skyCol00 rect: serializedVersion: 2 - x: 0 - y: 4237 - width: 3405 - height: 763 + x: 41 + y: 4827 + width: 3867 + height: 1151 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 48ef78302172c95d0800000000000000 internalID: -3054523488941900156 @@ -322,16 +322,16 @@ TextureImporter: name: moon00 rect: serializedVersion: 2 - x: 0 - y: 983 - width: 361 - height: 359 + x: 3048 + y: 2037 + width: 712 + height: 712 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 2eb42c374337c84d0800000000000000 internalID: -3131000971811730462 @@ -343,16 +343,16 @@ TextureImporter: name: moon01 rect: serializedVersion: 2 - x: 4 - y: 502 - width: 359 - height: 361 + x: 3905 + y: 2037 + width: 711 + height: 712 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 27379967b29689ff0800000000000000 internalID: -29157762183629966 @@ -364,16 +364,16 @@ TextureImporter: name: moon02 rect: serializedVersion: 2 - x: 0 - y: 18 - width: 360 - height: 363 + x: 4785 + y: 2037 + width: 713 + height: 712 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 48cce3d8ca1335490800000000000000 internalID: -7758803115855393660 @@ -385,16 +385,16 @@ TextureImporter: name: particle00_0 rect: serializedVersion: 2 - x: 2950 - y: 1132 - width: 44 - height: 36 + x: 4793 + y: 1591 + width: 168 + height: 138 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 33ad2ca09f53bcfd0800000000000000 internalID: -2320701839235687885 @@ -406,16 +406,16 @@ TextureImporter: name: particle00_1 rect: serializedVersion: 2 - x: 3043 - y: 1132 - width: 39 - height: 29 + x: 5050 + y: 1591 + width: 157 + height: 117 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b985370a3d8676e10800000000000000 internalID: 2190835001878337691 @@ -427,16 +427,16 @@ TextureImporter: name: particle00_2 rect: serializedVersion: 2 - x: 3124 - y: 1136 - width: 31 - height: 15 + x: 5298 + y: 1591 + width: 190 + height: 84 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1f023e9e4ba4369b0800000000000000 internalID: -5088141013119983375 @@ -448,16 +448,16 @@ TextureImporter: name: particle01 rect: serializedVersion: 2 - x: 3141 - y: 1264 - width: 44 - height: 60 + x: 5090 + y: 1337 + width: 76 + height: 111 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: cb8017a7496182fa0800000000000000 internalID: -5825381291038537540 @@ -469,16 +469,16 @@ TextureImporter: name: particle02 rect: serializedVersion: 2 - x: 3060 - y: 1254 - width: 49 - height: 70 + x: 4811 + y: 1337 + width: 74 + height: 111 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 2dd247a322e6cac80800000000000000 internalID: -8310146119116771886 @@ -490,16 +490,16 @@ TextureImporter: name: particle03 rect: serializedVersion: 2 - x: 3151 - y: 1198 - width: 19 - height: 21 + x: 3781.2002 + y: 1437.6001 + width: 22.800001 + height: 25.2 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 753e310371c7a0000800000000000000 internalID: 2951188799808343 @@ -511,16 +511,16 @@ TextureImporter: name: particle04 rect: serializedVersion: 2 - x: 2921 - y: 1207 - width: 110 - height: 117 + x: 5274 + y: 1289 + width: 223 + height: 200 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 507eba9a0f4dc2120800000000000000 internalID: 2390519632330745605 @@ -533,15 +533,15 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 3268 - width: 3456 - height: 871 + y: 4892 + width: 4147 + height: 1045 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b55f3c319486f6b60800000000000000 internalID: 7741520947546682715 @@ -554,15 +554,15 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 2355 - width: 3405 - height: 764 + y: 4933 + width: 4086 + height: 917 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d5a792edc137def90800000000000000 internalID: -6922750484375045539 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta index 99ae0889..82cd7007 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_launcher.png.meta @@ -47,7 +47,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 2 aniso: 1 mipBias: 0 wrapU: 1 @@ -61,7 +61,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 200 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -109,16 +109,16 @@ TextureImporter: name: launcherPivot rect: serializedVersion: 2 - x: 0 - y: 928 - width: 73 - height: 69 + x: 1340 + y: 1325 + width: 160 + height: 151 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: a7185d60c05421b40800000000000000 internalID: 5409462020381966714 @@ -130,16 +130,16 @@ TextureImporter: name: board00 rect: serializedVersion: 2 - x: 0 - y: 116 - width: 613 - height: 32 + x: 60 + y: 168 + width: 1106 + height: 54 alignment: 9 pivot: {x: 0.225, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: db7180a2917b93ea0800000000000000 internalID: -5892477318730344515 @@ -151,16 +151,16 @@ TextureImporter: name: board01 rect: serializedVersion: 2 - x: 0 - y: 208 - width: 612 - height: 169 + x: 69 + y: 1189 + width: 1088 + height: 297 alignment: 9 pivot: {x: 0.225, y: 0.85} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 05e3510969553a500800000000000000 internalID: 406262496544243280 @@ -172,16 +172,16 @@ TextureImporter: name: board02 rect: serializedVersion: 2 - x: 0 - y: 455 - width: 630 - height: 185 + x: 53 + y: 795 + width: 1120 + height: 324 alignment: 9 pivot: {x: 0.225, y: 0.15} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: a0b3e89b3544cae40800000000000000 internalID: 5668981157338692362 @@ -193,16 +193,16 @@ TextureImporter: name: board03 rect: serializedVersion: 2 - x: 0 - y: 699 - width: 624 - height: 181 + x: 80 + y: 313 + width: 1146 + height: 329 alignment: 9 pivot: {x: 0.225, y: 0.85} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 35661a3a52175a700800000000000000 internalID: 550970935895746131 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta index 86e37f85..64157e4e 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_man.png.meta @@ -143,7 +143,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -155,7 +155,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta index 13be7e8e..71d3d996 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/ntr_samurai_obj.png.meta @@ -122,7 +122,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -134,7 +134,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -382,8 +382,8 @@ TextureImporter: name: child_body rect: serializedVersion: 2 - x: 191 - y: 902 + x: 264 + y: 888 width: 96 height: 91 alignment: 0 @@ -487,9 +487,9 @@ TextureImporter: name: child_head00 rect: serializedVersion: 2 - x: 0 - y: 897 - width: 135 + x: 18 + y: 876 + width: 133 height: 103 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -508,9 +508,9 @@ TextureImporter: name: child_head01 rect: serializedVersion: 2 - x: 1 - y: 753 - width: 134 + x: 15 + y: 715 + width: 136 height: 103 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -529,8 +529,8 @@ TextureImporter: name: child_tear rect: serializedVersion: 2 - x: 205 - y: 784 + x: 258 + y: 758 width: 22 height: 35 alignment: 0 diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 122b448c..da1e5c50 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -25486,7 +25486,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1589389271} m_Direction: 2 m_Value: 1 - m_Size: 0.99929184 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -32510,7 +32510,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 129.9108} + m_AnchoredPosition: {x: 0, y: 130.00272} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index 7c07f2d3..f9f1724e 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -202,7 +202,7 @@ namespace HeavenStudio { if (ReportBeat(ref lastReportedBeat)) { - metronomeSound = Util.Jukebox.PlayOneShot("metronome", lastReportedBeat + 1f); + metronomeSound = Util.Jukebox.PlayOneShot("metronome", lastReportedBeat); } else if (songPositionInBeats < lastReportedBeat) { @@ -268,25 +268,25 @@ namespace HeavenStudio public double GetSongPosFromBeat(double beat) { var chart = GameManager.instance.Beatmap; - SetBpm(chart.bpm); + float bpm = chart.bpm; double counter = 0f; float lastTempoChangeBeat = 0f; - foreach (var t in GameManager.instance.Beatmap.tempoChanges) + foreach (DynamicBeatmap.TempoChange t in GameManager.instance.Beatmap.tempoChanges) { if (t.beat > beat) { break; } - counter += (t.beat - lastTempoChangeBeat) * secPerBeat; - SetBpm(t.tempo); + counter += (t.beat - lastTempoChangeBeat) * 60/bpm; + bpm = t.tempo; lastTempoChangeBeat = t.beat; } - counter += (beat - lastTempoChangeBeat) * secPerBeat; + counter += (beat - lastTempoChangeBeat) * 60/bpm; return counter; } @@ -307,7 +307,7 @@ namespace HeavenStudio double counterSeconds = -firstBeatOffset; float lastBpm = GameManager.instance.Beatmap.bpm; - foreach (var t in GameManager.instance.Beatmap.tempoChanges) + foreach (DynamicBeatmap.TempoChange t in GameManager.instance.Beatmap.tempoChanges) { double beatToNext = t.beat - lastTempoChangeBeat; double secToNext = BeatsToSecs(beatToNext, lastBpm); diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 65b2066d..9acfbf39 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -60,6 +60,21 @@ namespace HeavenStudio public static GameManager instance { get; private set; } private EventCaller eventCaller; + List inputOffsetSamples = new List(); + float averageInputOffset = 0; + public float AvgInputOffset + { + get + { + return averageInputOffset; + } + set + { + inputOffsetSamples.Add((int)value); + averageInputOffset = (float)inputOffsetSamples.Average(); + } + } + private void Awake() { // autoplay = true; @@ -344,6 +359,8 @@ namespace HeavenStudio public void Play(float beat) { canInput = true; + inputOffsetSamples.Clear(); + averageInputOffset = 0; StartCoroutine(PlayCo(beat)); onBeatChanged?.Invoke(beat); } @@ -383,6 +400,8 @@ namespace HeavenStudio onBeatChanged?.Invoke(beat); KillAllSounds(); + Debug.Log($"Average input offset for playthrough: {averageInputOffset}ms"); + if (playOnStart) { Play(0); diff --git a/Assets/Scripts/Games/FanClub/NtrIdolFan.cs b/Assets/Scripts/Games/FanClub/NtrIdolFan.cs index dda8cdaf..117aca86 100644 --- a/Assets/Scripts/Games/FanClub/NtrIdolFan.cs +++ b/Assets/Scripts/Games/FanClub/NtrIdolFan.cs @@ -99,7 +99,7 @@ namespace HeavenStudio.Games.Scripts_FanClub { if (PlayerInput.Pressed()) { - if (!FanClub.instance.IsExpectingInputNow()) + if (!FanClub.instance.IsExpectingInputNow(InputType.STANDARD_DOWN)) { ClapStart(false); } @@ -115,7 +115,7 @@ namespace HeavenStudio.Games.Scripts_FanClub } if (PlayerInput.PressedUp()) { - if (clappingStartTime != Single.MinValue && cond.songPositionInBeats > clappingStartTime + 2f && stopCharge && !FanClub.instance.IsExpectingInputNow()) + if (clappingStartTime != Single.MinValue && cond.songPositionInBeats > clappingStartTime + 2f && stopCharge && !FanClub.instance.IsExpectingInputNow(InputType.STANDARD_UP)) { JumpStart(false); } diff --git a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs index 9e8b1d4d..3529a781 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManJoe.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManJoe.cs @@ -139,7 +139,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (PlayerInput.Pressed(true) && !inSpecial) { - if (!KarateMan.instance.IsExpectingInputNow()) + if (!KarateMan.instance.IsExpectingInputNow(InputType.STANDARD_DOWN | InputType.DIRECTION_DOWN)) { Punch(1); Jukebox.PlayOneShotGame("karateman/swingNoHit", forcePlay: true); @@ -148,7 +148,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan if (PlayerInput.AltPressed() && KarateMan.IsComboEnable && !inSpecial) { - if (!KarateMan.instance.IsExpectingInputNow()) + if (!KarateMan.instance.IsExpectingInputNow(InputType.STANDARD_ALT_DOWN)) { //start a forced-fail combo sequence ForceFailCombo(cond.songPositionInBeats); @@ -156,7 +156,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan } else if (PlayerInput.AltPressedUp()) { - if (!KarateMan.instance.IsExpectingInputNow()) + if (!KarateMan.instance.IsExpectingInputNow(InputType.STANDARD_ALT_UP)) { if (inComboId != -1 && !lockedInCombo) { @@ -172,7 +172,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan //stopped holding, don't charge wantKick = false; } - else if (inKick && cond.GetPositionFromBeat(lastChargeTime, 2.75f) <= 0.5f && !KarateMan.instance.IsExpectingInputNow()) + else if (inKick && cond.GetPositionFromBeat(lastChargeTime, 2.75f) <= 0.5f && !KarateMan.instance.IsExpectingInputNow(InputType.STANDARD_UP | InputType.DIRECTION_UP)) { Kick(cond.songPositionInBeats); Jukebox.PlayOneShotGame("karateman/swingKick", forcePlay: true); diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs index 77199a8c..9842e318 100644 --- a/Assets/Scripts/Games/Minigame.cs +++ b/Assets/Scripts/Games/Minigame.cs @@ -8,7 +8,7 @@ namespace HeavenStudio.Games { public class Minigame : MonoBehaviour { - public static float earlyTime = 0.1f, perfectTime = 0.08f, aceEarlyTime = 0.025f, aceLateTime = 0.025f, lateTime = 0.08f, endTime = 0.1f; + public static float earlyTime = 0.07f, perfectTime = 0.04f, aceEarlyTime = 0.01f, aceLateTime = 0.01f, lateTime = 0.04f, endTime = 0.07f; [SerializeField] public SoundSequence.SequenceKeyValue[] SoundSequences; public List EligibleHits = new List(); @@ -107,7 +107,7 @@ namespace HeavenStudio.Games //Get the scheduled input that should happen the **Soonest** //Can return null if there's no scheduled inputs // remark: need a check for specific button(s) - public PlayerActionEvent GetClosestScheduledInput() + public PlayerActionEvent GetClosestScheduledInput(InputType input = InputType.ANY) { PlayerActionEvent closest = null; @@ -115,7 +115,8 @@ namespace HeavenStudio.Games { if(closest == null) { - closest = toCompare; + if (input == InputType.ANY || toCompare.inputType.HasFlag(input)) + closest = toCompare; } else { float t1 = closest.startBeat + closest.timer; @@ -123,7 +124,11 @@ namespace HeavenStudio.Games // Debug.Log("t1=" + t1 + " -- t2=" + t2); - if (t2 < t1) closest = toCompare; + if (t2 < t1) + { + if (input == InputType.ANY || toCompare.inputType.HasFlag(input)) + closest = toCompare; + } } } @@ -133,10 +138,9 @@ namespace HeavenStudio.Games //Hasn't been tested yet. *Should* work. //Can be used to detect if the user is expected to input something now or not //Useful for strict call and responses games like Tambourine - // remark: need a check for specific button(s) - public bool IsExpectingInputNow() + public bool IsExpectingInputNow(InputType wantInput = InputType.ANY) { - PlayerActionEvent input = GetClosestScheduledInput(); + PlayerActionEvent input = GetClosestScheduledInput(wantInput); if (input == null) return false; return input.IsExpectingInputNow(); } @@ -162,6 +166,16 @@ namespace HeavenStudio.Games return 1f + ScaleTimingMargin(endTime); } + public static float AceStartTime() + { + return 1f + ScaleTimingMargin(aceEarlyTime); + } + + public static float AceEndTime() + { + return 1f + ScaleTimingMargin(aceLateTime); + } + //scales timing windows to the BPM in an ""intelligent"" manner static float ScaleTimingMargin(float f) { diff --git a/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs b/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs index 07f95994..9ed247a0 100644 --- a/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs +++ b/Assets/Scripts/Games/PajamaParty/CtrPillowPlayer.cs @@ -49,7 +49,7 @@ namespace HeavenStudio.Games.Scripts_PajamaParty { var cond = Conductor.instance; - if (PlayerInput.Pressed() && canJump && !PajamaParty.instance.IsExpectingInputNow()) + if (PlayerInput.Pressed() && canJump && !PajamaParty.instance.IsExpectingInputNow(InputType.STANDARD_DOWN)) { Jukebox.PlayOneShot("miss"); PlayerJump(cond.songPositionInBeats, true, false); @@ -58,7 +58,7 @@ namespace HeavenStudio.Games.Scripts_PajamaParty { StartCharge(); } - if (PlayerInput.AltPressedUp() && charging && !PajamaParty.instance.IsExpectingInputNow()) + if (PlayerInput.AltPressedUp() && charging && !PajamaParty.instance.IsExpectingInputNow(InputType.STANDARD_ALT_UP)) { Jukebox.PlayOneShot("miss"); EndCharge(cond.songPositionInBeats, false, false); @@ -424,7 +424,7 @@ namespace HeavenStudio.Games.Scripts_PajamaParty var cond = Conductor.instance; if (canSleep) { - anim.DoScaledAnimationAsync("MakoSleepThrough", -1, 0); + anim.DoScaledAnimationAsync("MakoSleepThrough", 1, 0); caller.CanHit(false); canSleep = false; } diff --git a/Assets/Scripts/Games/PlayerActionEvent.cs b/Assets/Scripts/Games/PlayerActionEvent.cs index f9e48c26..f038b02d 100644 --- a/Assets/Scripts/Games/PlayerActionEvent.cs +++ b/Assets/Scripts/Games/PlayerActionEvent.cs @@ -60,8 +60,7 @@ namespace HeavenStudio.Games if (noAutoplay && autoplayOnly) autoplayOnly = false; if (noAutoplay && triggersAutoplay){ triggersAutoplay = false; } - float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat,timer); - // allows ace detection with this new system + float normalizedBeat = GetNormalizedTime(); float stateProg = ((normalizedBeat - Minigame.PerfectTime()) / (Minigame.LateTime() - Minigame.PerfectTime()) - 0.5f) * 2; StateCheck(normalizedBeat); @@ -74,6 +73,10 @@ namespace HeavenStudio.Games if (state.perfect) { Hit(stateProg); + if (normalizedBeat >= Minigame.AceStartTime() && normalizedBeat <= Minigame.AceEndTime()) + { + // push an ace event + } } else if (state.early && !perfectOnly) { @@ -92,10 +95,20 @@ namespace HeavenStudio.Games public bool IsExpectingInputNow() { - float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, timer); + float normalizedBeat = GetNormalizedTime(); return normalizedBeat > Minigame.EarlyTime() && normalizedBeat < Minigame.EndTime(); } + float GetNormalizedTime() + { + var cond = Conductor.instance; + double currTime = cond.GetSongPosFromBeat(cond.songPositionInBeatsAsDouble); + double targetTime = cond.GetSongPosFromBeat(startBeat + timer); + double min = targetTime - 1f; + double max = targetTime + 1f; + return 1f + (float)(((currTime - min) / (max - min))-0.5f)*2; + } + public bool IsCorrectInput() { // This one is a mouthful but it's an evil good to detect the correct input @@ -138,6 +151,9 @@ namespace HeavenStudio.Games { if(canHit) { + float normalized = GetNormalizedTime() - 1f; + int offset = Mathf.CeilToInt((float)normalized * 1000); + GameManager.instance.AvgInputOffset = offset; OnHit(this, state); CleanUp(); } else diff --git a/Assets/Scripts/Games/PlayerActionObject.cs b/Assets/Scripts/Games/PlayerActionObject.cs index e626823a..fcd8ff64 100644 --- a/Assets/Scripts/Games/PlayerActionObject.cs +++ b/Assets/Scripts/Games/PlayerActionObject.cs @@ -32,7 +32,7 @@ namespace HeavenStudio.Games { if (aceTimes == 0) { - if (triggersAutoplay && (GameManager.instance.autoplay || autoPlay) && GameManager.instance.canInput && normalizedBeat > 0.995f) + if (triggersAutoplay && (GameManager.instance.autoplay || autoPlay) && GameManager.instance.canInput && normalizedBeat >= 1f - (Time.deltaTime*0.5f)) { OnAce(); if (!autoPlay) diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs index e44131c3..ae08a51e 100644 --- a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs +++ b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiChild.cs @@ -4,6 +4,7 @@ using HeavenStudio.Util; using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Rendering; namespace HeavenStudio.Games.Scripts_NtrSamurai { @@ -27,7 +28,7 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai if (!isMain) { var cond = Conductor.instance; - float prog = Conductor.instance.GetPositionFromBeat(startBeat + 1f, 2f); + float prog = Conductor.instance.GetPositionFromBeat(startBeat + 1f, 4f); if (prog >= 0) { Walk(); diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs index 71a8e891..856c1ae6 100644 --- a/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs +++ b/Assets/Scripts/Games/SamuraiSliceNtr/NtrSamuraiObject.cs @@ -106,8 +106,19 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai { switch (flyProg) { + case -3: // near miss on board launch + flyPos = cond.GetPositionFromBeat(startBeat, 2f); + transform.position = currentCurve.GetPoint(flyPos); + transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (180f * Time.deltaTime)); + + if (flyPos > 1f) + { + GameObject.Destroy(gameObject); + return; + } + break; case -2: // being carried by a child - flyPos = cond.GetPositionFromBeat(startBeat + 2f, 2f); + flyPos = cond.GetPositionFromBeat(startBeat + 2f, 4f); if (heldPos == null || flyPos > 1f) { GameObject.Destroy(gameObject); @@ -130,6 +141,7 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai secondHalf.heldPos = child.DebrisPosL; } flyProg = -2; + GetComponent().sortingOrder = 7; return; } break; @@ -247,6 +259,15 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai public void LaunchSuccess(PlayerActionEvent caller, float state) { + if (state <= -1f || state >= 1f) + { + startBeat = launchProg.startBeat + 2f; + currentCurve = SamuraiSliceNtr.instance.NgLaunchCurve; + flyProg = -3; + Jukebox.PlayOneShotGame("samuraiSliceNtr/ntrSamurai_launchImpact", pitch: 2f); + launchProg.Disable(); + return; + } launchProg.Disable(); DoLaunch(); Jukebox.PlayOneShotGame("samuraiSliceNtr/ntrSamurai_launchImpact", pitch: UnityEngine.Random.Range(0.85f, 1.05f)); @@ -262,6 +283,15 @@ namespace HeavenStudio.Games.Scripts_NtrSamurai public void HitSuccess(PlayerActionEvent caller, float state) { + if (state <= -1f || state >= 1f) + { + startBeat = hitProg.startBeat + hitProg.timer; + currentCurve = SamuraiSliceNtr.instance.NgDebrisCurve; + flyProg = -3; + Jukebox.PlayOneShotGame("samuraiSliceNtr/ntrSamurai_ng"); + hitProg.Disable(); + return; + } flyProg = -1; hitProg.Disable(); if (UnityEngine.Random.Range(0f, 1f) >= 0.5f) diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs index 930d452b..58e3d953 100644 --- a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs +++ b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs @@ -2,6 +2,7 @@ using HeavenStudio.Util; using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Rendering; using DG.Tweening; using NaughtyBezierCurves; @@ -63,6 +64,7 @@ namespace HeavenStudio.Games public BezierCurve3D NgLaunchCurve; public BezierCurve3D DebrisLeftCurve; public BezierCurve3D DebrisRightCurve; + public BezierCurve3D NgDebrisCurve; //game scene public static SamuraiSliceNtr instance; @@ -144,6 +146,7 @@ namespace HeavenStudio.Games mobjDat.Bop(); mobj.SetActive(true); + mobj.GetComponent().sortingOrder = 7; return mobjDat; } diff --git a/Assets/Scripts/InputType.cs b/Assets/Scripts/InputType.cs index b1cc4ade..3861636e 100644 --- a/Assets/Scripts/InputType.cs +++ b/Assets/Scripts/InputType.cs @@ -7,6 +7,8 @@ namespace HeavenStudio { [System.Flags] public enum InputType : int { + // Shouldn't be used by minigame scripts + ANY = -1, //General //------- diff --git a/Assets/Shaders/Mapped.shader b/Assets/Shaders/Mapped.shader new file mode 100644 index 00000000..447a8899 --- /dev/null +++ b/Assets/Shaders/Mapped.shader @@ -0,0 +1,124 @@ +Shader "Sprites/Mapped" +{ + Properties + { + [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} + _Color ("Tint", Color) = (1,1,1,1) + _ColorAlpha ("Red Colourmap", Color) = (1,1,1,1) + _ColorBravo ("Green Colourmap", Color) = (1,1,1,1) + _ColorDelta ("Blue Colourmap", Color) = (1,1,1,1) + + _StencilComp ("Stencil Comparison", Float) = 8 + _Stencil ("Stencil ID", Float) = 0 + _StencilOp ("Stencil Operation", Float) = 0 + _StencilWriteMask ("Stencil Write Mask", Float) = 255 + _StencilReadMask ("Stencil Read Mask", Float) = 255 + + _ColorMask ("Color Mask", Float) = 15 + + [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip ("Use Alpha Clip", Float) = 0 + } + + SubShader + { + Tags + { + "Queue"="Transparent" + "IgnoreProjector"="True" + "RenderType"="Transparent" + "PreviewType"="Plane" + "CanUseSpriteAtlas"="True" + } + + Stencil + { + Ref [_Stencil] + Comp [_StencilComp] + Pass [_StencilOp] + ReadMask [_StencilReadMask] + WriteMask [_StencilWriteMask] + } + + Cull Off + Lighting Off + ZWrite Off + ZTest [unity_GUIZTestMode] + Blend SrcAlpha OneMinusSrcAlpha + ColorMask [_ColorMask] + + Pass + { + Name "Default" + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 2.0 + + #include "UnityCG.cginc" + #include "UnityUI.cginc" + + #pragma multi_compile_local _ UNITY_UI_CLIP_RECT + #pragma multi_compile_local _ UNITY_UI_ALPHACLIP + + struct appdata_t + { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct v2f + { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 worldPosition : TEXCOORD1; + UNITY_VERTEX_OUTPUT_STEREO + }; + + sampler2D _MainTex; + fixed4 _Color; + fixed4 _ColorAlpha; + fixed4 _ColorBravo; + fixed4 _ColorDelta; + fixed4 _AddColor; + fixed4 _TextureSampleAdd; + float4 _ClipRect; + float4 _MainTex_ST; + + v2f vert(appdata_t v) + { + v2f OUT; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); + OUT.worldPosition = v.vertex; + OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); + + OUT.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + OUT.color = v.color; + return OUT; + } + + fixed4 frag(v2f IN) : SV_Target + { + half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; + half4 mappedColor = _ColorAlpha * color.r + _ColorBravo * color.g + _ColorDelta * color.b; + half a = color.a; + color = mappedColor; + color.a = a; + + #ifdef UNITY_UI_CLIP_RECT + color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); + #endif + + #ifdef UNITY_UI_ALPHACLIP + clip (color.a - 0.001); + #endif + + return color; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Shaders/Mapped.shader.meta b/Assets/Shaders/Mapped.shader.meta new file mode 100644 index 00000000..4ea1b5d7 --- /dev/null +++ b/Assets/Shaders/Mapped.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: af40ea27225ac294189e15c2851fcc90 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 81c9a086..efcc9d9c 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index 1e304ecc..e947ea0b 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 2483180215 +CRC: 269036586 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/ctrpillow/common b/Assets/StreamingAssets/ctrpillow/common index c0557191..66283fc2 100644 Binary files a/Assets/StreamingAssets/ctrpillow/common and b/Assets/StreamingAssets/ctrpillow/common differ diff --git a/Assets/StreamingAssets/ctrpillow/common.manifest b/Assets/StreamingAssets/ctrpillow/common.manifest index 50cfdbfa..097df484 100644 --- a/Assets/StreamingAssets/ctrpillow/common.manifest +++ b/Assets/StreamingAssets/ctrpillow/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 3465358365 +CRC: 1892614618 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 3a4fb33b5553c823eef6c8ecb04520e1 + Hash: 8ff1428cac5d100c2c1477d081eb9bd7 TypeTreeHash: serializedVersion: 2 Hash: f7c97b63c72a16f96d1364bd2603929e @@ -43,6 +43,7 @@ ClassTypes: Script: {instanceID: 0} SerializeReferenceClassIdentifiers: [] Assets: +- Assets/Resources/Sprites/Games/PajamaParty/pillow_obj.png - Assets/Resources/Games/pajamaParty.prefab - Assets/Resources/Sfx/games/pajamaParty/jumpJust.wav - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoPickUp.anim @@ -53,10 +54,12 @@ Assets: - Assets/Resources/Sfx/games/pajamaParty/five4.ogg - Assets/Resources/Sfx/games/pajamaParty/charge.ogg - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoReadySleep.anim +- Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/NoPose.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoCatchNg.anim - Assets/Resources/Sprites/Games/PajamaParty/pillow_half_half.png - Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyBeat.anim - Assets/Resources/Sfx/games/pajamaParty/siesta1.ogg +- Assets/Resources/Sprites/Games/PajamaParty/pillow_objMapped.mat - Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep01.anim - Assets/Resources/Sfx/games/pajamaParty/throw2.ogg - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoAwake.anim @@ -78,6 +81,7 @@ Assets: - Assets/Resources/Sfx/games/pajamaParty/throw3.ogg - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoThrowOut.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyJump.anim +- Assets/Resources/Sprites/Games/PajamaParty/pillow_obj02.png - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoJump.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoSleepNg.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoThrough.anim @@ -99,10 +103,11 @@ Assets: - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoSleepThrough.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/MakoPillow/NoPose.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoSleepJust.anim -- Assets/Resources/Sprites/Games/PajamaParty/Anime/Bed/BedImpact.anim +- Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/Bg.controller - Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/Monkey.controller - Assets/Resources/Sprites/Games/PajamaParty/Anime/Mako/MakoSleepOut.anim -- Assets/Resources/Sprites/Games/PajamaParty/pillow_obj.png +- Assets/Resources/Sprites/Games/PajamaParty/Anime/Bed/BedImpact.anim +- Assets/Resources/Sprites/Games/PajamaParty/Anime/BG/SlideOpen.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeySleep00.anim - Assets/Resources/Sprites/Games/PajamaParty/Anime/Monkey/MonkeyLand.anim - Assets/Resources/Sfx/games/pajamaParty/siesta4.ogg diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common index 097c309a..4131bff0 100644 Binary files a/Assets/StreamingAssets/karate/common and b/Assets/StreamingAssets/karate/common differ diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest index b78ae019..7f00e22b 100644 --- a/Assets/StreamingAssets/karate/common.manifest +++ b/Assets/StreamingAssets/karate/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 229325513 +CRC: 2860754384 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 069bce0dd25bdbc41e83dc4b09bd8143 + Hash: ca520b8e60b447d7c76fa7e61aa5b1ba TypeTreeHash: serializedVersion: 2 Hash: 98a6d4eb4172ec02b55d5f14afb2d5a8 diff --git a/Assets/StreamingAssets/ntrdj/common b/Assets/StreamingAssets/ntrdj/common index 13581fca..a542858b 100644 Binary files a/Assets/StreamingAssets/ntrdj/common and b/Assets/StreamingAssets/ntrdj/common differ diff --git a/Assets/StreamingAssets/ntrdj/common.manifest b/Assets/StreamingAssets/ntrdj/common.manifest index 30bd83c9..88d25f24 100644 --- a/Assets/StreamingAssets/ntrdj/common.manifest +++ b/Assets/StreamingAssets/ntrdj/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2301979922 +CRC: 1204495741 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 74daac4e15aeb26555c25ea85b33b9f7 + Hash: 2dd423bc9f1eae6f6ebe51f1dc57b8b7 TypeTreeHash: serializedVersion: 2 Hash: b0396ee8cf677796daf23b65e38d1ad2 @@ -43,81 +43,90 @@ SerializeReferenceClassIdentifiers: - AssemblyName: Assembly-CSharp ClassName: HeavenStudio.Games.Minigame/Eligible Assets: -- Assets/Resources/Sfx/games/djSchool/letsGo2.ogg -- Assets/Resources/Sfx/games/djSchool/andStop1.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller - Assets/Resources/Sfx/games/djSchool/breakCmonLoud2.ogg - Assets/Resources/Sfx/games/djSchool/ohYeahAlt1.ogg - Assets/Resources/Sfx/games/djSchool/checkItOut2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/Student_Turntable_Swipe.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Hold.anim -- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hey.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Scratcho2.anim - Assets/Resources/Sfx/games/djSchool/scratchoHey1.ogg -- Assets/Resources/Sfx/games/djSchool/checkItOut3.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/DJ Yellow.controller -- Assets/Resources/Sfx/games/djSchool/checkItOut.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/BreakCmon.anim -- Assets/Resources/Sfx/games/djSchool/checkItOut1.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/DJ Yellow.controller - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Scratcho.anim - Assets/Resources/Sprites/Games/DJSchool/slam.png - Assets/Resources/Sfx/games/djSchool/ohYeah1.ogg -- Assets/Resources/Sprites/Games/DJSchool/djYellow/djYellow_Torso.png -- Assets/Resources/Sfx/games/djSchool/breakCmonLoud1.ogg +- Assets/Resources/Sfx/games/djSchool/andStop2.ogg - Assets/Resources/Sfx/games/djSchool/recordStop.ogg - Assets/Resources/Sfx/games/djSchool/breakCmon2.ogg -- Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud4.ogg -- Assets/Resources/Sfx/games/djSchool/andStop2.ogg +- Assets/Resources/Sfx/games/djSchool/breakCmonLoud1.ogg - Assets/Resources/Sfx/games/djSchool/ohYeahAlt.ogg +- Assets/Resources/Sprites/Games/DJSchool/table.png +- Assets/Resources/Sfx/games/djSchool/breakCmonAlt2.ogg +- Assets/Resources/Sfx/games/djSchool/letsGo1.ogg +- Assets/Resources/Sfx/games/djSchool/heyAlt.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/FlashInverse.anim +- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg +- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg +- Assets/Resources/Sfx/games/djSchool/yay.ogg +- Assets/Resources/Sprites/Games/DJSchool/background.png +- Assets/Resources/Sprites/Games/DJSchool/Animations/flashInverse.controller +- Assets/Resources/Sprites/Games/DJSchool/turntable.png +- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg +- Assets/Resources/Sfx/games/djSchool/ooh.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hold.anim +- Assets/Resources/Sfx/games/djSchool/cheer.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/HoldBop.anim +- Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg +- Assets/Resources/Sfx/games/djSchool/letsGo2.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim +- Assets/Resources/Sfx/games/djSchool/andStop1.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim +- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hey.anim +- Assets/Resources/Sfx/games/djSchool/checkItOut3.ogg +- Assets/Resources/Sfx/games/djSchool/checkItOut.ogg +- Assets/Resources/Sfx/games/djSchool/checkItOut1.ogg +- Assets/Resources/Sprites/Games/DJSchool/djYellow/djYellow_Torso.png +- Assets/Resources/Sfx/games/djSchool/scratchoHey3.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim - Assets/Resources/Sfx/games/djSchool/ohYeahAlt3.ogg - Assets/Resources/Sprites/Games/DJSchool/djYellow/djYellow_Heads.png -- Assets/Resources/Sprites/Games/DJSchool/table.png - Assets/Resources/Sfx/games/djSchool/ohYeah.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop2.anim - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud3.ogg - Assets/Resources/Sfx/games/djSchool/breakCmon1.ogg -- Assets/Resources/Sfx/games/djSchool/letsGo1.ogg -- Assets/Resources/Sfx/games/djSchool/heyAlt.ogg -- Assets/Resources/Sfx/games/djSchool/breakCmonAlt2.ogg -- Assets/Resources/Sfx/games/djSchool/oohAlt.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Student.controller -- Assets/Resources/Sprites/Games/DJSchool/Animations/FlashInverse.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/flash.controller -- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Student.controller +- Assets/Resources/Sfx/games/djSchool/oohAlt.ogg - Assets/Resources/Sfx/games/djSchool/breakCmonAlt1.ogg -- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg -- Assets/Resources/Sfx/games/djSchool/yay.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/TurnTable.controller +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim - Assets/Resources/Sprites/Games/DJSchool/student.png - Assets/Resources/Sfx/games/djSchool/ohYeah2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Flash.anim -- Assets/Resources/Sprites/Games/DJSchool/background.png - Assets/Resources/Sfx/games/djSchool/heyLoud.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt2.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHey4.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/flashInverse.controller - Assets/Resources/Sfx/games/djSchool/recordSwipe.ogg - Assets/Resources/Games/djSchool.prefab -- Assets/Resources/Sprites/Games/DJSchool/turntable.png -- Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHey2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/TurnTable_Player.controller - Assets/Resources/Sprites/Games/DJSchool/flash.png - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Idle.anim -- Assets/Resources/Sfx/games/djSchool/ooh.ogg - Assets/Resources/Sfx/games/djSchool/letsGo.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hold.anim +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim - Assets/Resources/Sfx/games/djSchool/ohYeahAlt2.ogg +- Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/HoldBop.anim - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Idle.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Swipe.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/DJYellow_Turntable.anim -- Assets/Resources/Sfx/games/djSchool/cheer.ogg - Assets/Resources/Sfx/games/djSchool/oohLoud.ogg -- Assets/Resources/Sprites/Games/DJSchool/Animations/Student/HoldBop.anim - Assets/Resources/Sfx/games/djSchool/hey.ogg -- Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/IdleBop.anim Dependencies: [] diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common index 090dbf47..8ed85d85 100644 Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest index 26e74afe..7a2ce5b4 100644 --- a/Assets/StreamingAssets/ntridol/common.manifest +++ b/Assets/StreamingAssets/ntridol/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2160738779 +CRC: 47635452 Hashes: AssetFileHash: serializedVersion: 2 - Hash: ad07dd4676edfbe5572d0236124a4350 + Hash: fa7d40aea94aec8235f3ce553fcce97a TypeTreeHash: serializedVersion: 2 Hash: 6c542f6873f7e3067be67f888d87c947 diff --git a/Assets/StreamingAssets/ntrsamurai/common b/Assets/StreamingAssets/ntrsamurai/common index c0ee0c26..429adf6a 100644 Binary files a/Assets/StreamingAssets/ntrsamurai/common and b/Assets/StreamingAssets/ntrsamurai/common differ diff --git a/Assets/StreamingAssets/ntrsamurai/common.manifest b/Assets/StreamingAssets/ntrsamurai/common.manifest index 20ea2e4a..7cbe25c4 100644 --- a/Assets/StreamingAssets/ntrsamurai/common.manifest +++ b/Assets/StreamingAssets/ntrsamurai/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 1283939881 +CRC: 4046274216 Hashes: AssetFileHash: serializedVersion: 2 - Hash: d166274169e80ae349c4e66b396c95a6 + Hash: fbefce6855ad769437bbebae6d47090a TypeTreeHash: serializedVersion: 2 - Hash: 36c1544bd987dbffd607c6771ff240cf + Hash: c6f2fa553316a4075c6f2b9622a36b58 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4a9cc8c0..66955a6f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -51,7 +51,7 @@ PlayerSettings: m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 - m_StackTraceTypes: 010000000100000001000000010000000100000001000000 + m_StackTraceTypes: 020000000200000002000000020000000200000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0