diff --git a/Assets/Resources/Games/kitties.prefab b/Assets/Resources/Games/kitties.prefab index 7e290ba02..e5690d7be 100644 --- a/Assets/Resources/Games/kitties.prefab +++ b/Assets/Resources/Games/kitties.prefab @@ -32,6 +32,7 @@ Transform: - {fileID: 6691967487608269649} - {fileID: 4707274700374772890} - {fileID: 243092960887094366} + - {fileID: 3583215250709699121} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -60,6 +61,7 @@ MonoBehaviour: - {fileID: 7519509861423932029} - {fileID: 8491422747466352054} - {fileID: 4025001298363446642} + Fish: {fileID: 1802531360429422655} --- !u!1 &3078320056411217663 GameObject: m_ObjectHideFlags: 0 @@ -431,7 +433,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5732993530102640725, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5885532416014275924, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_FlipX @@ -650,6 +652,96 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e0cfe8bc5e77011419ade3fe44843c26, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &4220829415564060384 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7036960847367506643} + m_Modifications: + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2562694720695475935, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_Name + value: Fish + objectReference: {fileID: 0} + - target: {fileID: 2562694720695475935, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} +--- !u!1 &1802531360429422655 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2562694720695475935, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + m_PrefabInstance: {fileID: 4220829415564060384} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3583215250709699121 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + m_PrefabInstance: {fileID: 4220829415564060384} + m_PrefabAsset: {fileID: 0} +--- !u!95 &5434748764845535254 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802531360429422655} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: ffbce4f5959b9f943a608b05ba221332, 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!1001 &4408415186550367516 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Games/Kitties/Fish.prefab b/Assets/Resources/Prefabs/Games/Kitties/Fish.prefab new file mode 100644 index 000000000..0d3514dc0 --- /dev/null +++ b/Assets/Resources/Prefabs/Games/Kitties/Fish.prefab @@ -0,0 +1,281 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &89602097143325905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 351456659208781754} + - component: {fileID: 5927895372098577490} + m_Layer: 0 + m_Name: FishLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &351456659208781754 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 89602097143325905} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.1, y: 3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 804251750464191697} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5927895372098577490 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 89602097143325905} + 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: 0 + m_Sprite: {fileID: -6088740353780400943, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.26, y: 5.94} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1207840866110291702 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 563140690894891567} + - component: {fileID: 58286339412307189} + m_Layer: 0 + m_Name: FishHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &563140690894891567 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1207840866110291702} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.4, z: -1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 804251750464191697} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &58286339412307189 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1207840866110291702} + 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: 0 + m_Sprite: {fileID: 4313510954544578308, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.26, y: 5.94} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2562694720695475935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 804251750464191697} + m_Layer: 0 + m_Name: Fish + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &804251750464191697 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2562694720695475935} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 563140690894891567} + - {fileID: 5197824937521813313} + - {fileID: 351456659208781754} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7416601200544754134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5197824937521813313} + - component: {fileID: 5478223872584025936} + m_Layer: 0 + m_Name: FishBody + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5197824937521813313 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7416601200544754134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 804251750464191697} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5478223872584025936 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7416601200544754134} + 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: 0 + m_Sprite: {fileID: 8405063258882217834, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.66, y: 1.89} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Prefabs/Games/Kitties/Fish.prefab.meta b/Assets/Resources/Prefabs/Games/Kitties/Fish.prefab.meta new file mode 100644 index 000000000..3f093bfb8 --- /dev/null +++ b/Assets/Resources/Prefabs/Games/Kitties/Fish.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d3b29c99cb1e18c4fba59ed3feb6a183 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/DangleFish.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/DangleFish.anim new file mode 100644 index 000000000..6eabf1e48 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/DangleFish.anim @@ -0,0 +1,241 @@ +%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: DangleFish + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 6, 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: 0.5 + value: {x: -0.5, y: 5, z: 0} + inSlope: {x: 0, y: -2, z: 0} + outSlope: {x: 0, y: -2, 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.2, y: 4, z: 0} + inSlope: {x: 0, y: -2, z: 0} + outSlope: {x: 0, y: -2, 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.5 + value: {x: 0, y: 3, 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: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 24 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.5 + 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: + - 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: 0.5 + value: -0.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 6 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 5 + inSlope: -2 + outSlope: -2 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 4 + inSlope: -2 + outSlope: -2 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 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: + 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: 0.5 + 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 + - serializedVersion: 3 + time: 1.5 + 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: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/DangleFish.anim.meta b/Assets/Resources/Sprites/Games/Kitties/Animations/DangleFish.anim.meta new file mode 100644 index 000000000..aa7f61674 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/DangleFish.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc0d1842989a5a34fa02bd23de3e7e3b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Fish.controller b/Assets/Resources/Sprites/Games/Kitties/Animations/Fish.controller new file mode 100644 index 000000000..e83079cab --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Fish.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-2495831348430586477 +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: 9158163228283184747} + m_Position: {x: 200, y: 0, 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: 9158163228283184747} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Fish + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2495831348430586477} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &9158163228283184747 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DangleFish + 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: bc0d1842989a5a34fa02bd23de3e7e3b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Fish.controller.meta b/Assets/Resources/Sprites/Games/Kitties/Animations/Fish.controller.meta new file mode 100644 index 000000000..b01730d58 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Fish.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ffbce4f5959b9f943a608b05ba221332 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/FishDangle.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/FishDangle.anim new file mode 100644 index 000000000..bda9fffad --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FishDangle.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: FishDangle + 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/Kitties/Animations/FishDangle.anim.meta b/Assets/Resources/Sprites/Games/Kitties/Animations/FishDangle.anim.meta new file mode 100644 index 000000000..13096ac75 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FishDangle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a990165502c1a945960b794a4671fb5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/FishNotice.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/FishNotice.anim new file mode 100644 index 000000000..98b442e09 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FishNotice.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: FishNotice + 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/Kitties/Animations/FishNotice.anim.meta b/Assets/Resources/Sprites/Games/Kitties/Animations/FishNotice.anim.meta new file mode 100644 index 000000000..11b8310fe --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FishNotice.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8399d445f3079624f87465a7bcdaa3e0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller index 957ffc5d6..b7b3a5def 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller @@ -71,6 +71,32 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-7147574915638117007 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FishDangle + 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: 8a990165502c1a945960b794a4671fb5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-6881703200918331298 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -404,6 +430,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2766744301008221322} m_Position: {x: 420, y: 300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3589226953959344988} + m_Position: {x: 455, y: 365, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7147574915638117007} + m_Position: {x: 490, y: 430, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -570,6 +602,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &3589226953959344988 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FishNotice + 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: 8399d445f3079624f87465a7bcdaa3e0, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &4006658929380800863 AnimatorState: serializedVersion: 6 diff --git a/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs b/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs index 076ba8523..45e230b6f 100644 --- a/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs +++ b/Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs @@ -52,8 +52,13 @@ namespace HeavenStudio.Games.Scripts_Kitties public void ScheduleRoll(float beat) { - Kitties.instance.ScheduleInput(beat, 2f, InputType.STANDARD_ALT_DOWN, SpinSuccessOne, SpinMiss, SpinEmpty); - Kitties.instance.ScheduleInput(beat, 2.75f, InputType.STANDARD_ALT_UP, SpinSuccessTwo, SpinMiss, SpinEmpty); + Kitties.instance.ScheduleInput(beat, 2f, InputType.STANDARD_ALT_DOWN, SpinSuccessOne, SpinMissOne, SpinEmpty); + Kitties.instance.ScheduleInput(beat, 2.75f, InputType.STANDARD_ALT_UP, SpinSuccessTwo, SpinMissTwo, SpinEmpty); + } + + public void ScheduleFish(float beat) + { + Kitties.instance.ScheduleInput(beat, 2.75f, InputType.STANDARD_DOWN, FishSuccess, FishMiss, FishEmpty); } public void ClapSuccessOne(PlayerActionEvent Caller, float state) @@ -140,14 +145,34 @@ namespace HeavenStudio.Games.Scripts_Kitties Jukebox.PlayOneShotGame("kitties/roll6"); } - public void SpinMiss(PlayerActionEvent caller) + public void SpinMissOne(PlayerActionEvent caller) { - Jukebox.PlayOneShotGame("miss"); + Jukebox.PlayOneShotGame("kitties/roll5", -1f, 1, .3f); + } + + public void SpinMissTwo(PlayerActionEvent caller) + { + Jukebox.PlayOneShotGame("kitties/roll6", -1f, 1, .3f); } public void SpinEmpty(PlayerActionEvent caller) { } + + public void FishSuccess(PlayerActionEvent caller, float beat) + { + Jukebox.PlayOneShotGame("kitties/fish4"); + } + + public void FishMiss(PlayerActionEvent caller) + { + Jukebox.PlayOneShot("miss"); + } + + public void FishEmpty(PlayerActionEvent caller) + { + + } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/Kitties/Kitties.cs b/Assets/Scripts/Games/Kitties/Kitties.cs index cbc9c8ecd..9c3c27737 100644 --- a/Assets/Scripts/Games/Kitties/Kitties.cs +++ b/Assets/Scripts/Games/Kitties/Kitties.cs @@ -27,12 +27,23 @@ namespace HeavenStudio.Games.Loaders } }, - new GameAction("spin", "Spin") + new GameAction("roll", "Roll") { - function = delegate { Kitties.instance.Spin(eventCaller.currentEntity.beat); }, + function = delegate { Kitties.instance.Roll(eventCaller.currentEntity["toggle"], eventCaller.currentEntity.beat); }, defaultLength = 4f, - } + + parameters = new List() + { + new Param("toggle", false, "Keep Cats spawned", "Sets whether or not cats stay spawned after their cue"), + } + }, + + new GameAction ("fish", "Fish") + { + function = delegate { Kitties.instance.CatchFish(eventCaller.currentEntity.beat); }, + defaultLength = 6f, + } });; } @@ -47,6 +58,8 @@ namespace HeavenStudio.Games public Animator[] kitties; public GameObject[] Cats; + public GameObject Fish; + public enum SpawnType { Straight, @@ -158,7 +171,7 @@ namespace HeavenStudio.Games } } - public void Spin(float beat) + public void Roll(bool keepSpawned, float beat) { player.ScheduleRoll(beat); MultiSound.Play(new MultiSound.Sound[] { @@ -209,6 +222,36 @@ namespace HeavenStudio.Games // new BeatAction.Action(beat + 1.5f, delegate { kitties[x].Play("RollStart", 0, 0); }), // }); //} + + if (!keepSpawned) + { + BeatAction.New(Cats[0], new List() + { + new BeatAction.Action(beat + 3.5f, delegate { Cats[0].transform.GetChild(0).gameObject.SetActive(false);}), + new BeatAction.Action(beat + 3.5f, delegate { Cats[1].transform.GetChild(0).gameObject.SetActive(false);}), + new BeatAction.Action(beat + 3.5f, delegate { Cats[2].transform.GetChild(0).gameObject.SetActive(false);}), + new BeatAction.Action(beat + 3.5f, delegate { player.canClap = false;}), + }); + } + } + + public void CatchFish(float beat) + { + player.ScheduleFish(beat); + MultiSound.Play(new MultiSound.Sound[] { + new MultiSound.Sound("kitties/fish1", beat + 2f), + new MultiSound.Sound("kitties/fish2", beat + 2.25f), + new MultiSound.Sound("kitties/fish3", beat + 2.5f), + + }); + + BeatAction.New(Cats[0], new List() + { + new BeatAction.Action(beat, delegate { Fish.SetActive(true); }), + new BeatAction.Action(beat, delegate { Fish.GetComponent().Play("DangleFish", 0, 0); }), + }); + + } public void Spawn(int pos, int catNum, bool isMice, bool isInverse, bool firstSpawn)