mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Kitties Inputs Done and Custom Background sorta done

Browse source
This commit is contained in:
Bhaos 2023-01-25 05:47:10 -06:00
parent 83f77d5a70
commit 2dec194368
10 changed files with 3003 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
Assets/Resources/Games/kitties.prefab
View file

@ -62,6 +62,17 @@ MonoBehaviour:
- {fileID: 8491422747466352054}
- {fileID: 4025001298363446642}
Fish: {fileID: 1802531360429422655}
isInverted: 0
background: {fileID: 7937651759158650330}
positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
rotationAngles:
- 0
- 0
- 0
currentBGColor: {r: 1, g: 1, b: 1, a: 0}
--- !u!1 &3078320056411217663
GameObject:
m_ObjectHideFlags: 0
@ -667,6 +678,14 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 7036960847367506643}
m_Modifications:
- target: {fileID: 351456659208781754, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: -0.1
objectReference: {fileID: 0}
- target: {fileID: 351456659208781754, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.y
value: 3.5
objectReference: {fileID: 0}
- target: {fileID: 563140690894891567, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -675,6 +694,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 563140690894891567, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 804251750464191697, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_RootOrder
value: 4
@ -731,6 +754,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1641745052695201597, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1914031279705403905, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_RootOrder
value: 5
@ -743,13 +770,33 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2355602929664985000, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: -2.76
objectReference: {fileID: 0}
- target: {fileID: 2355602929664985000, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.y
value: -1.24
objectReference: {fileID: 0}
- target: {fileID: 2355602929664985000, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalRotation.w
value: -0.1872441
objectReference: {fileID: 0}
- target: {fileID: 2355602929664985000, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalRotation.z
value: -0.98231345
objectReference: {fileID: 0}
- target: {fileID: 2355602929664985000, 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: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3058374496064346722, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_RootOrder
@ -759,10 +806,34 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4666926648281214805, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_Size.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4666926648281214805, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_Size.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4666926648281214805, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 0}
- target: {fileID: 4666926648281214805, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_WasSpriteAssigned
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5039125954992600110, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 3220635104661186870, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3}
- target: {fileID: 5156553359444558849, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: 2.34
objectReference: {fileID: 0}
- target: {fileID: 5156553359444558849, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.y
value: 3.37
objectReference: {fileID: 0}
- target: {fileID: 5197824937521813313, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -771,6 +842,18 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5478223872584025936, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_SortingOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 5708132237603999281, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: -2.83
objectReference: {fileID: 0}
- target: {fileID: 5708132237603999281, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.y
value: 3.85
objectReference: {fileID: 0}
- target: {fileID: 5780113371824918312, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: 0.67769367
@ -787,6 +870,14 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6098664157529513489, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: -4.25
objectReference: {fileID: 0}
- target: {fileID: 6098664157529513489, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.y
value: 1.44
objectReference: {fileID: 0}
- target: {fileID: 6189000375408403958, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_FlipX
value: 0
@ -827,6 +918,26 @@ PrefabInstance:
propertyPath: m_WasSpriteAssigned
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7232692753612868689, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: -1.5348978
objectReference: {fileID: 0}
- target: {fileID: 7232692753612868689, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.y
value: 1.068711
objectReference: {fileID: 0}
- target: {fileID: 7232692753612868689, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.z
value: -2.583691
objectReference: {fileID: 0}
- target: {fileID: 7708050652662539783, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: 3.13
objectReference: {fileID: 0}
- target: {fileID: 7708050652662539783, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.y
value: -0.08999964
objectReference: {fileID: 0}
- target: {fileID: 9136856607628409213, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3}
propertyPath: m_LocalPosition.x
value: 0

172
Assets/Resources/Prefabs/Games/Kitties/Fish.prefab
View file

@ -189,7 +189,7 @@ Transform:
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_LocalPosition: {x: 0, y: 0.4, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 804251750464191697}
@ -410,6 +410,88 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1641745052695201597
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7232692753612868689}
- component: {fileID: 6047759408794403869}
m_Layer: 0
m_Name: ExclamationPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &7232692753612868689
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1641745052695201597}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.5348978, y: 1.068711, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 804251750464191697}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6047759408794403869
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1641745052695201597}
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: 9109945632691231925, 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: 3.52, y: 4.32}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1898300406519786287
GameObject:
m_ObjectHideFlags: 0
@ -771,6 +853,7 @@ Transform:
- {fileID: 9136856607628409213}
- {fileID: 1914031279705403905}
- {fileID: 3058374496064346722}
- {fileID: 7232692753612868689}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -856,6 +939,88 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3269035253036634654
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4001420000512500101}
- component: {fileID: 4666926648281214805}
m_Layer: 0
m_Name: Kitty3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4001420000512500101
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3269035253036634654}
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: 3058374496064346722}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4666926648281214805
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3269035253036634654}
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: 0}
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: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3705961836644690659
GameObject:
m_ObjectHideFlags: 0
@ -871,7 +1036,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &3058374496064346722
Transform:
m_ObjectHideFlags: 0
@ -885,6 +1050,7 @@ Transform:
m_Children:
- {fileID: 974216286394886085}
- {fileID: 5780113371824918312}
- {fileID: 4001420000512500101}
m_Father: {fileID: 804251750464191697}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -913,7 +1079,7 @@ Transform:
m_GameObject: {fileID: 5881903395094489078}
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_LocalScale: {x: 0.65, y: 0.65, z: 1}
m_Children:
- {fileID: 6098664157529513489}
- {fileID: 2355602929664985000}

1758
Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim Normal file
View file

File diff suppressed because it is too large Load diff

8
Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 547e95233859f9748964251265244a43
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

534
Assets/Resources/Sprites/Games/Kitties/Animations/CaughtSuccess.anim
View file

@ -62,13 +62,29 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path: ActionLines
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 161.182}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Hearts/Heart (2)
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -2.66, y: 4.93, z: 0}
value: {x: -2.68, y: 5.09, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -84,7 +100,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -1.03, y: 1.91, z: -1}
value: {x: -1.2, y: 2.29, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -116,7 +132,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -4.5, y: -1, z: 0}
value: {x: -4.53, y: -0.97, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -132,7 +148,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.14, y: -2, z: 0}
value: {x: -0.14, y: -2.75, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
@ -175,6 +191,86 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -3.73, y: -0.97999996, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Hearts/Heart (2)
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -5.69, y: 2.33, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Hearts/Heart (1)
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -4.2, y: 5.62, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Hearts/Heart (3)
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 3.05, y: 5.13, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Hearts/Heart (4)
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 3.42, y: 0.33, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: Hearts/Heart (5)
m_ScaleCurves: []
m_FloatCurves:
- curve:
@ -430,6 +526,41 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1448705555
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2104765904
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 1329745746
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 252309
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 421062868
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3764951554
attribute: 4
@ -451,6 +582,13 @@ AnimationClip:
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 1448705555
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
- serializedVersion: 2
path: 3725016781
attribute: 4197328169
@ -509,7 +647,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -2.66
value: -2.68
inSlope: 0
outSlope: 0
tangentMode: 136
@ -528,7 +666,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 4.93
value: 5.09
inSlope: 0
outSlope: 0
tangentMode: 136
@ -566,7 +704,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1.03
value: -1.2
inSlope: 0
outSlope: 0
tangentMode: 136
@ -585,7 +723,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: 1.91
value: 2.29
inSlope: 0
outSlope: 0
tangentMode: 136
@ -604,7 +742,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
@ -870,7 +1008,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -4.5
value: -4.53
inSlope: 0
outSlope: 0
tangentMode: 136
@ -889,7 +1027,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -1
value: -0.97
inSlope: 0
outSlope: 0
tangentMode: 136
@ -984,7 +1122,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
value: -2
value: -2.75
inSlope: 0
outSlope: 0
tangentMode: 136
@ -1207,6 +1345,348 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -3.73
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Hearts/Heart (2)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.97999996
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Hearts/Heart (2)
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Hearts/Heart (2)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -5.69
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Hearts/Heart (1)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 2.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Hearts/Heart (1)
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Hearts/Heart (1)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -4.2
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Hearts/Heart (3)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 5.62
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Hearts/Heart (3)
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Hearts/Heart (3)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 3.05
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Hearts/Heart (4)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 5.13
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Hearts/Heart (4)
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Hearts/Heart (4)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 3.42
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: Hearts/Heart (5)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: Hearts/Heart (5)
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: Hearts/Heart (5)
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path: Hearts/Heart (2)
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path: Hearts/Heart (2)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 161.182
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path: Hearts/Heart (2)
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
@ -1298,6 +1778,36 @@ AnimationClip:
path: ActionLines
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path: Hearts/Heart (2)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path: Hearts/Heart (2)
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path: Hearts/Heart (2)
classID: 4
script: {fileID: 0}
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

214
Assets/Resources/Sprites/Games/Kitties/Animations/DangleFish.anim
View file

@ -58,6 +58,65 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.08, y: 0.38, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: -0.08, y: 0.38, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.875
value: {x: -0.08, y: 0.38, 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.5
value: {x: -0.08, y: 0.38, 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: FishHolder
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: -0.14, y: 3.63, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path: FishLine
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
@ -75,6 +134,20 @@ AnimationClip:
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 2058252471
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 3764951554
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
@ -235,6 +308,147 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.08
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: FishHolder
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.38
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: FishHolder
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: 0.875
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: FishHolder
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.14
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path: FishLine
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 3.63
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path: FishLine
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
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path: FishLine
classID: 4
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0

29
Assets/Resources/Sprites/Games/Kitties/Animations/Fish.controller
View file

@ -26,6 +26,32 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-4312695180291439474
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CaughtFail
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: 547e95233859f9748964251265244a43, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &-2495831348430586477
AnimatorStateMachine:
serializedVersion: 6
@ -41,6 +67,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: -7559277065772935933}
m_Position: {x: 235, y: 65, z: 0}
- serializedVersion: 1
m_State: {fileID: -4312695180291439474}
m_Position: {x: 270, y: 130, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []

24
Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta
View file

@ -191,6 +191,9 @@ TextureImporter:
- first:
213: -3642517504267728846
second: kittiesCatchFail_0
- first:
213: -8704930900230542521
second: kittiesCatchFail_2
externalObjects: {}
serializedVersion: 11
mipmaps:
@ -1674,6 +1677,27 @@ TextureImporter:
indices:
edges: []
weights: []
- serializedVersion: 2
name: kittiesCatchFail_2
rect:
serializedVersion: 2
x: 860
y: 69
width: 653
height: 288
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 74bef69877fd13780800000000000000
internalID: -8704930900230542521
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []

3
Assets/Scripts/Games/Kitties/CtrTeppanPlayer.cs
View file

@ -191,13 +191,16 @@ namespace HeavenStudio.Games.Scripts_Kitties
public void FishSuccess(PlayerActionEvent caller, float beat)
{
Kitties.instance.RemoveCats(false);
Jukebox.PlayOneShotGame("kitties/fish4");
fish.Play("CaughtSuccess", 0, 0);
}
public void FishMiss(PlayerActionEvent caller)
{
Kitties.instance.RemoveCats(false);
Jukebox.PlayOneShot("miss");
fish.Play("CaughtFail", 0, 0);
}
public void FishEmpty(PlayerActionEvent caller)

291
Assets/Scripts/Games/Kitties/Kitties.cs
View file

@ -42,10 +42,35 @@ namespace HeavenStudio.Games.Loaders
new GameAction ("fish", "Fish")
{
function = delegate { Kitties.instance.CatchFish(eventCaller.currentEntity.beat); },
defaultLength = 6f,
}
defaultLength = 4f,
},
});;
new GameAction("instantSpawn", "Instant Spawn")
{
function = delegate { Kitties.instance.InstantSpawn(eventCaller.currentEntity["toggle"], eventCaller.currentEntity["toggle1"],
eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); },
defaultLength = .5f,
parameters = new List<Param>()
{
new Param("type", Kitties.SpawnType.Straight, "Spawn", "The way in which the kitties will spawn"),
new Param("toggle", false, "Mice", "Replaces kitties as mice"),
new Param("toggle1", false, "Invert Direction", "Inverts the direction they clap in"),
new Param("toggle2", false, "Keep Cats Spawned", "Sets whether or not cats stay spawned after their cue"),
}
},
new GameAction("bgcolor", "Background Color")
{
function = delegate {Kitties.instance.BackgroundColor(eventCaller.currentEntity["color"]); },
defaultLength = .5f,
parameters = new List<Param>()
{
new Param("color", Kitties.defaultBGColor, "Change BG Color", "Changes background color"),
}
}
});
}
}
}
@ -59,6 +84,23 @@ namespace HeavenStudio.Games
public GameObject[] Cats;
public GameObject Fish;
public bool isInverted;
public SpriteRenderer background;
public Vector3[] positions;
public float[] rotationAngles;
private static Color _defaultBGColor;
public static Color defaultBGColor
{
get
{
ColorUtility.TryParseHtmlString("#FFFFFF", out _defaultBGColor);
return _defaultBGColor;
}
}
public Color currentBGColor;
public enum SpawnType
{
@ -89,25 +131,26 @@ namespace HeavenStudio.Games
new MultiSound.Sound("kitties/nya2", beat + .75f),
new MultiSound.Sound("kitties/nya3", beat + 1.5f)
});
if(type == 3)
{
BeatAction.New(Cats[0], new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate { Spawn(type, 0, isMice, isInverse, true);}),
new BeatAction.Action(beat, delegate { Spawn(type, 0, isMice, isInverse, true, false);}),
new BeatAction.Action(beat + 2.5f, delegate { kitties[0].Play("FaceClap", 0, 0);}),
new BeatAction.Action(beat + 3f, delegate { kitties[0].Play("FaceClap", 0, 0);}),
});
BeatAction.New(Cats[1], new List<BeatAction.Action>()
{
new BeatAction.Action(beat + .75f, delegate { Spawn(type, 1, isMice, isInverse, false);}),
new BeatAction.Action(beat + .75f, delegate { Spawn(type, 1, isMice, isInverse, false, false);}),
new BeatAction.Action(beat + 2.5f, delegate { kitties[1].Play("FaceClap", 0, 0);}),
new BeatAction.Action(beat + 3f, delegate { kitties[1].Play("FaceClap", 0, 0);}),
});
BeatAction.New(Cats[2], new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 1.5f, delegate { Spawn(type, 2, isMice, isInverse, false);}),
new BeatAction.Action(beat + 1.5f, delegate { Spawn(type, 2, isMice, isInverse, false, false);}),
new BeatAction.Action(beat + 1.5f, delegate { player.canClap = true;}),
});
}
@ -116,21 +159,21 @@ namespace HeavenStudio.Games
{
BeatAction.New(Cats[0], new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate { Spawn(type, 0, isMice, isInverse, true);}),
new BeatAction.Action(beat, delegate { Spawn(type, 0, isMice, isInverse, true, false);}),
new BeatAction.Action(beat + 2.5f, delegate { kitties[0].Play("Clap1", 0, 0);}),
new BeatAction.Action(beat + 3f, delegate { kitties[0].Play("Clap2", 0, 0);}),
});
BeatAction.New(Cats[1], new List<BeatAction.Action>()
{
new BeatAction.Action(beat + .75f, delegate { Spawn(type, 1, isMice, isInverse, false);}),
new BeatAction.Action(beat + .75f, delegate { Spawn(type, 1, isMice, isInverse, false, false);}),
new BeatAction.Action(beat + 2.5f, delegate { kitties[1].Play("Clap1", 0, 0);}),
new BeatAction.Action(beat + 3f, delegate { kitties[1].Play("Clap2", 0, 0);}),
});
BeatAction.New(Cats[2], new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 1.5f, delegate { Spawn(type, 2, isMice, isInverse, false);}),
new BeatAction.Action(beat + 1.5f, delegate { Spawn(type, 2, isMice, isInverse, false, false);}),
new BeatAction.Action(beat + 1.5f, delegate { player.canClap = true;}),
});
@ -139,21 +182,21 @@ namespace HeavenStudio.Games
{
BeatAction.New(Cats[0], new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate { Spawn(type, 0, isMice, isInverse, true);}),
new BeatAction.Action(beat, delegate { Spawn(type, 0, isMice, isInverse, true, false);}),
new BeatAction.Action(beat + 2.5f, delegate { kitties[0].Play("MiceClap1", 0, 0);}),
new BeatAction.Action(beat + 3f, delegate { kitties[0].Play("MiceClap2", 0, 0);}),
});
BeatAction.New(Cats[1], new List<BeatAction.Action>()
{
new BeatAction.Action(beat + .75f, delegate { Spawn(type, 1, isMice, isInverse, false);}),
new BeatAction.Action(beat + .75f, delegate { Spawn(type, 1, isMice, isInverse, false, false);}),
new BeatAction.Action(beat + 2.5f, delegate { kitties[1].Play("MiceClap1", 0, 0);}),
new BeatAction.Action(beat + 3f, delegate { kitties[1].Play("MiceClap2", 0, 0);}),
});
BeatAction.New(Cats[2], new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 1.5f, delegate { Spawn(type, 2, isMice, isInverse, false);}),
new BeatAction.Action(beat + 1.5f, delegate { Spawn(type, 2, isMice, isInverse, false, false);}),
new BeatAction.Action(beat + 1.5f, delegate { player.canClap = true;}),
});
@ -163,16 +206,15 @@ namespace HeavenStudio.Games
{
BeatAction.New(Cats[0], new List<BeatAction.Action>()
{
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;}),
new BeatAction.Action(beat + 3.5f, delegate { RemoveCats(false);})
});
}
}
public void Roll(bool keepSpawned, float beat)
{
if (!player.canClap)
return;
player.ScheduleRoll(beat);
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("kitties/roll1", beat),
@ -210,33 +252,23 @@ namespace HeavenStudio.Games
new BeatAction.Action(beat + 2f, delegate { player.ScheduleRollFinish(beat); })
});
//for (int x = 0; x < 3; x++)
//{
// Debug.Log(x + " " + kitties.Length);
// BeatAction.New(Cats[x], new List<BeatAction.Action>()
// {
// new BeatAction.Action(beat, delegate { kitties[x].Play("RollStart", 0, 0); }),
// new BeatAction.Action(beat + .5f, delegate { kitties[x].Play("RollStart", 0, 0); }),
// new BeatAction.Action(beat + 1f, delegate { kitties[x].Play("RollStart", 0, 0); }),
// new BeatAction.Action(beat + 1.5f, delegate { kitties[x].Play("RollStart", 0, 0); }),
// });
//}
if (!keepSpawned)
{
BeatAction.New(Cats[0], new List<BeatAction.Action>()
{
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;}),
new BeatAction.Action(beat + 3.5f, delegate { RemoveCats(false);})
});
}
}
public void CatchFish(float beat)
{
if (!player.canClap)
return;
if (isInverted)
Fish.transform.localScale = new Vector3(-1f, 1f, 1f);
else
Fish.transform.localScale = new Vector3(1f, 1f, 1f);
player.ScheduleFish(beat);
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("kitties/fish1", beat + 2f),
@ -248,48 +280,41 @@ namespace HeavenStudio.Games
BeatAction.New(Cats[0], new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate { Fish.SetActive(true); }),
new BeatAction.Action(beat, delegate { Fish.GetComponent<Animator>().Play("DangleFish", 0, 0); }),
new BeatAction.Action(beat, delegate { Fish.GetComponent<Animator>().DoScaledAnimationAsync("FishDangle", 0.5f); }),
new BeatAction.Action(beat + 2f, delegate { kitties[0].Play("FishNotice", 0, 0); }),
new BeatAction.Action(beat + 2.25f, delegate { kitties[1].Play("FishNotice2", 0, 0); }),
new BeatAction.Action(beat + 2.5f, delegate { kitties[2].Play("FishNotice3", 0, 0); }),
new BeatAction.Action(beat + 2.75f, delegate {RemoveCats(true); })
new BeatAction.Action(beat + 2.5f, delegate { kitties[2].Play("FishNotice3", 0, 0); })
});
BeatAction.New(Fish, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + 4f, delegate { Fish.SetActive(false);})
});
}
public void Spawn(int pos, int catNum, bool isMice, bool isInverse, bool firstSpawn)
public void Spawn(int pos, int catNum, bool isMice, bool isInverse, bool firstSpawn, bool instant)
{
if(firstSpawn)
ResetRotation(catNum);
if (firstSpawn)
{
ResetRotation();
isInverted = isInverse;
switch (pos)
{
case 0:
if (!isInverse)
{
Cats[0].transform.position = new Vector3(-5.11f, -0.5f, 0f);
Cats[1].transform.position = new Vector3(.32f, -0.5f, 0f);
Cats[2].transform.position = new Vector3(5.75f, -0.5f, 0f);
for (int x = 0; x < 3; x++)
{
Cats[x].transform.GetChild(0).gameObject.GetComponent<SpriteRenderer>().flipX = true;
Cats[x].transform.GetChild(1).gameObject.transform.localScale = new Vector3(1f, 1f, 1f);
}
positions[0] = new Vector3(-5.11f, -1.25f, 0f);
positions[1] = new Vector3(.32f, -1.25f, 0f);
positions[2] = new Vector3(5.75f, -1.25f, 0f);
}
else
{
Cats[0].transform.position = new Vector3(5.75f, -0.5f, 0f);
Cats[1].transform.position = new Vector3(.32f, -0.5f, 0f);
Cats[2].transform.position = new Vector3(-5.11f, -0.5f, 0f);
for (int x = 0; x < 3; x++)
{
Cats[x].transform.GetChild(0).gameObject.GetComponent<SpriteRenderer>().flipX = false;
Cats[x].transform.GetChild(1).gameObject.transform.localScale = new Vector3(-1f, 1f, 1f);
}
positions[0] = new Vector3(5.75f, -1.25f, 0f);
positions[1] = new Vector3(.32f, -1.25f, 0f);
positions[2] = new Vector3(-5.11f, -1.5f, 0f);
}
break;
@ -297,27 +322,15 @@ namespace HeavenStudio.Games
if (!isInverse)
{
Cats[0].transform.position = new Vector3(-6.61f, 2.5f, 6f);
Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f);
Cats[2].transform.position = new Vector3(4.25f, -1f, -2f);
for (int x = 0; x < 3; x++)
{
Cats[x].transform.GetChild(0).gameObject.GetComponent<SpriteRenderer>().flipX = true;
Cats[x].transform.GetChild(1).gameObject.transform.localScale = new Vector3(1f, 1f, 1f);
}
positions[0] = new Vector3(-6.61f, 1.75f, 6f);
positions[1] = new Vector3(.32f, -.25f, 2f);
positions[2] = new Vector3(4.25f, -1.75f, -2f);
}
else
{
Cats[0].transform.position = new Vector3(6.61f, 2.5f, 6f);
Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f);
Cats[2].transform.position = new Vector3(-4.25f, -1f, -2f);
for (int x = 0; x < 3; x++)
{
Cats[x].transform.GetChild(0).gameObject.GetComponent<SpriteRenderer>().flipX = false;
Cats[x].transform.GetChild(1).gameObject.transform.localScale = new Vector3(-1f, 1f, 1f);
}
positions[0] = new Vector3(6.61f, 1.75f, 6f);
positions[1] = new Vector3(.32f, -.25f, 2f);
positions[2] = new Vector3(-4.25f, -1.75f, -2f);
}
break;
@ -325,49 +338,25 @@ namespace HeavenStudio.Games
if (!isInverse)
{
Cats[0].transform.position = new Vector3(4.25f, -1f, -2f);
Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f);
Cats[2].transform.position = new Vector3(-6.61f, 2.5f, 6f);
for (int x = 0; x < 3; x++)
{
Cats[x].transform.GetChild(0).gameObject.GetComponent<SpriteRenderer>().flipX = true;
Cats[x].transform.GetChild(1).gameObject.transform.localScale = new Vector3(1f, 1f, 1f);
}
positions[0] = new Vector3(4.25f, -1.75f, -2f);
positions[1] = new Vector3(.32f, -.25f, 2f);
positions[2] = new Vector3(-6.61f, 1.75f, 6f);
}
else
{
Cats[0].transform.position = new Vector3(-4.25f, -1f, -2f);
Cats[1].transform.position = new Vector3(.32f, 0.5f, 2f);
Cats[2].transform.position = new Vector3(6.61f, 2.5f, 6f);
for (int x = 0; x < 3; x++)
{
Cats[x].transform.GetChild(0).gameObject.GetComponent<SpriteRenderer>().flipX = false;
Cats[x].transform.GetChild(1).gameObject.transform.localScale = new Vector3(-1f, 1f, 1f);
}
positions[0] = new Vector3(-4.25f, -1.75f, -2f);
positions[1] = new Vector3(.32f, -.25f, 2f);
positions[2] = new Vector3(6.61f, 1.75f, 6f);
}
break;
case 3:
if (firstSpawn)
{
var rotationVector = Cats[0].transform.rotation.eulerAngles;
rotationVector.z = -135;
Cats[0].transform.position = new Vector3(-8.21f, 3.7f, 0f);
Cats[0].transform.rotation = Quaternion.Euler(rotationVector);
Cats[1].transform.position = new Vector3(7.51f, 4.2f, 0f);
rotationVector.z = 135;
Cats[1].transform.rotation = Quaternion.Euler(rotationVector);
Cats[2].transform.position = new Vector3(.32f, -4.25f, 0f);
for (int x = 0; x < 3; x++)
{
Cats[x].transform.GetChild(0).gameObject.GetComponent<SpriteRenderer>().flipX = false;
Cats[x].transform.GetChild(1).gameObject.transform.localScale = new Vector3(1f, 1f, 1f);
Cats[x].transform.GetChild(2).gameObject.transform.localScale = new Vector3(-1f, 1f, 1f);
}
rotationAngles = new float[] { -135f, 135f, 0f };
positions[0] = new Vector3(-8.21f, 3.7f, 0f);
positions[1] = new Vector3(7.51f, 4.2f, 0f);
positions[2] = new Vector3(.32f, -4.25f, 0f);
}
break;
@ -376,41 +365,89 @@ namespace HeavenStudio.Games
break;
}
}
Cats[catNum].transform.GetChild(0).gameObject.SetActive(true);
if(pos == 3)
Cats[catNum].transform.position = positions[catNum];
if (pos != 3)
{
kitties[catNum].Play("FacePopIn", 0, 0);
if (!isInverse)
Cats[catNum].transform.localScale = new Vector3(1f, 1f, 1f);
else
Cats[catNum].transform.localScale = new Vector3(-1f, 1f, 1f);
}
else if(!isMice)
kitties[catNum].Play("PopIn", 0, 0);
else if (catNum < 2)
else
{
kitties[catNum].Play("MicePopIn", 0, 0);
var rotationVector = Cats[catNum].transform.rotation.eulerAngles;
rotationVector.z = rotationAngles[catNum];
Cats[catNum].transform.rotation = Quaternion.Euler(rotationVector);
Cats[catNum].transform.localScale = new Vector3(-1f, 1f, 1f);
}
Cats[catNum].transform.GetChild(0).gameObject.SetActive(true);
if (!instant)
{
if (pos == 3)
{
kitties[catNum].Play("FacePopIn", 0, 0);
}
else if (!isMice)
kitties[catNum].Play("PopIn", 0, 0);
else if (catNum < 2)
{
kitties[catNum].Play("MicePopIn", 0, 0);
}
else
kitties[catNum].Play("PopIn", 0, 0);
}
else
kitties[catNum].Play("PopIn", 0, 0);
{
if(pos == 3)
kitties[catNum].Play("FaceIdle", 0, 0);
else if (!isMice)
kitties[catNum].Play("Idle", 0, 0);
else if (catNum < 2)
kitties[catNum].Play("MiceIdle", 0, 0);
else
kitties[catNum].Play("Idle", 0, 0);
}
}
public void ResetRotation()
public void ResetRotation(int catNum)
{
for (int i = 0; i < 3; i++)
{
var rotationVector = Cats[0].transform.rotation.eulerAngles;
rotationVector.z = 0;
Cats[i].transform.rotation = Quaternion.Euler(rotationVector);
}
var rotationVector = Cats[0].transform.rotation.eulerAngles;
rotationVector.z = 0;
Cats[catNum].transform.rotation = Quaternion.Euler(rotationVector);
}
public void RemoveCats(bool fishing)
{
if(fishing)
if (!fishing)
{
for (int x = 0; x < 3; x++)
{
Cats[x].SetActive(false);
Cats[x].transform.GetChild(0).gameObject.SetActive(false);
}
player.canClap = false;
}
else
Fish.SetActive(false);
player.canClap = false;
}
public void InstantSpawn(bool isMice, bool isInverse, float beat, int pos)
{
BeatAction.New(Cats[0], new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate { Spawn(pos, 0, isMice, isInverse, true, true); }),
new BeatAction.Action(beat, delegate { Spawn(pos, 1, isMice, isInverse, true, true); }),
new BeatAction.Action(beat, delegate { Spawn(pos, 2, isMice, isInverse, true, true); })
});
player.canClap = true;
}
public void BackgroundColor(Color color)
{
background.color = color;
currentBGColor = background.color;
}
}
}