diff --git a/Assets/Resources/Games/kitties.prefab b/Assets/Resources/Games/kitties.prefab new file mode 100644 index 000000000..98d92c954 --- /dev/null +++ b/Assets/Resources/Games/kitties.prefab @@ -0,0 +1,333 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2250680790597400440 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7036960847367506643} + - component: {fileID: 3690047631547957932} + m_Layer: 0 + m_Name: kitties + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7036960847367506643 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2250680790597400440} + 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: 9016940820184833692} + - {fileID: 6691967487608269649} + - {fileID: 4707274700374772890} + - {fileID: 243092960887094366} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3690047631547957932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2250680790597400440} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 88dcedc3c54551e4aa578b6fa2a4241a, type: 3} + m_Name: + m_EditorClassIdentifier: + SoundSequences: [] + EligibleHits: [] + scheduledInputs: [] + firstEnable: 0 +--- !u!1 &3078320056411217663 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9016940820184833692} + - component: {fileID: 7937651759158650330} + m_Layer: 0 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9016940820184833692 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3078320056411217663} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 20, y: 20, z: 1} + m_Children: [] + m_Father: {fileID: 7036960847367506643} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7937651759158650330 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3078320056411217663} + 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: -1000 + m_Sprite: {fileID: 7482667652216324306, guid: 394eab447e3d92140be461519b267611, 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.34, y: 1.34} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &2351138345471083223 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7036960847367506643} + m_Modifications: + - target: {fileID: 5258587802238640298, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_Name + value: Kitty1 + objectReference: {fileID: 0} + - target: {fileID: 5258587802238640298, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.x + value: -5.11 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} +--- !u!4 &6691967487608269649 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + m_PrefabInstance: {fileID: 2351138345471083223} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4408415186550367516 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7036960847367506643} + m_Modifications: + - target: {fileID: 5258587802238640298, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_Name + value: Kitty2 + objectReference: {fileID: 0} + - target: {fileID: 5258587802238640298, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.x + value: 0.32 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} +--- !u!4 &4707274700374772890 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + m_PrefabInstance: {fileID: 4408415186550367516} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9160863588390442456 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7036960847367506643} + m_Modifications: + - target: {fileID: 5258587802238640298, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_Name + value: KittyPlayer + objectReference: {fileID: 0} + - target: {fileID: 5258587802238640298, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.x + value: 5.75 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} +--- !u!4 &243092960887094366 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8970694537643043206, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + m_PrefabInstance: {fileID: 9160863588390442456} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Games/kitties.prefab.meta b/Assets/Resources/Games/kitties.prefab.meta new file mode 100644 index 000000000..c5ded0720 --- /dev/null +++ b/Assets/Resources/Games/kitties.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5725e76556dcedd4bb5f0e3962d5bf10 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Games/Kitties.meta b/Assets/Resources/Prefabs/Games/Kitties.meta new file mode 100644 index 000000000..d9f524ec1 --- /dev/null +++ b/Assets/Resources/Prefabs/Games/Kitties.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 76d2eaf44c2eb034e924a59d0dd66335 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Games/Kitties/Kitties.prefab b/Assets/Resources/Prefabs/Games/Kitties/Kitties.prefab new file mode 100644 index 000000000..4b07f4928 --- /dev/null +++ b/Assets/Resources/Prefabs/Games/Kitties/Kitties.prefab @@ -0,0 +1,664 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2532528378222940896 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4236132835555929771} + - component: {fileID: 8154867582994820091} + m_Layer: 0 + m_Name: Star1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4236132835555929771 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2532528378222940896} + 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: 8968395744991307443} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8154867582994820091 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2532528378222940896} + 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: -7540619746044756223, 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.89, y: 0.92} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2911595626162086778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8968395744991307443} + m_Layer: 0 + m_Name: Effects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8968395744991307443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2911595626162086778} + 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: 1651603046336064138} + - {fileID: 8000684639506543239} + - {fileID: 4975873416024091834} + - {fileID: 4236132835555929771} + - {fileID: 5885898476848634904} + - {fileID: 585628444887355239} + m_Father: {fileID: 8970694537643043206} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4095086036449551980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5885898476848634904} + - component: {fileID: 675976981540494925} + m_Layer: 0 + m_Name: Star2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5885898476848634904 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4095086036449551980} + 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: 8968395744991307443} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &675976981540494925 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4095086036449551980} + 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: 5030738185955279627, 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.89, y: 0.92} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4736979556405118395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4975873416024091834} + - component: {fileID: 1199308468064959743} + m_Layer: 0 + m_Name: Star + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4975873416024091834 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4736979556405118395} + 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: 8968395744991307443} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1199308468064959743 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4736979556405118395} + 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: -7937288927019184270, 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.89, y: 0.92} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5055270875105467526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 585628444887355239} + - component: {fileID: 1716317223809858669} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &585628444887355239 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5055270875105467526} + 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: 8968395744991307443} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1716317223809858669 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5055270875105467526} + 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: -890089858769695482, 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.86, y: 1.58} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &5258587802238640298 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8970694537643043206} + - component: {fileID: 6071300102877996365} + m_Layer: 0 + m_Name: Kitties + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8970694537643043206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5258587802238640298} + 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: 3555030977011516957} + - {fileID: 8968395744991307443} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &6071300102877996365 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5258587802238640298} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e3eab4144c1040f46a1c5a88b1a3fc45, 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 &5732993530102640725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3555030977011516957} + - component: {fileID: 1250984528353694784} + m_Layer: 0 + m_Name: Kitty + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3555030977011516957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732993530102640725} + 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: 8970694537643043206} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1250984528353694784 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5732993530102640725} + 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: -5801956193589078948, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.551111, y: 5.851429} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6519446341025961767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1651603046336064138} + - component: {fileID: 5885532416014275924} + m_Layer: 0 + m_Name: clapFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1651603046336064138 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6519446341025961767} + 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: 8968395744991307443} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5885532416014275924 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6519446341025961767} + 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: 5439475645685310803, 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: 1.28, y: 1.61} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8472956240391547104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8000684639506543239} + - component: {fileID: 5970247833878880864} + m_Layer: 0 + m_Name: RedFX + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8000684639506543239 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8472956240391547104} + 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: 8968395744991307443} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5970247833878880864 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8472956240391547104} + 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: 13554184045283124, 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: 1.26, y: 1.61} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Resources/Prefabs/Games/Kitties/Kitties.prefab.meta b/Assets/Resources/Prefabs/Games/Kitties/Kitties.prefab.meta new file mode 100644 index 000000000..c67576001 --- /dev/null +++ b/Assets/Resources/Prefabs/Games/Kitties/Kitties.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ab46f36f89873b64d838385a0ffe5b9a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png index dc2974713..d48f6b771 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png and b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png index 605b03daf..ff98a01da 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png and b/Assets/Resources/Sprites/Editor/GameIcons/catchyTune_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/countIn.png b/Assets/Resources/Sprites/Editor/GameIcons/countIn.png index 1d47161b9..150f2793d 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/countIn.png and b/Assets/Resources/Sprites/Editor/GameIcons/countIn.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta index d4ec1bbb7..53ae1e9c3 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/countIn.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png new file mode 100644 index 000000000..43fca8464 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.jpg.meta b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta similarity index 83% rename from Assets/Resources/Sprites/Editor/GameIcons/doubleDate.jpg.meta rename to Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta index 9eaaeee5c..525c2ab51 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.jpg.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/countIn_mask.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cae460600d16be4408fc25403e34a9d8 +guid: 894e99a28a66992488bc27246c7bf042 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -65,10 +65,22 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.jpg b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.jpg deleted file mode 100644 index 0c0701e24..000000000 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.jpg and /dev/null differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png new file mode 100644 index 000000000..861566383 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png.meta new file mode 100644 index 000000000..ae4c64a01 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c2f7c3c1d7cf40147917fcaefc77dd91 +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png new file mode 100644 index 000000000..edaeaaccd Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta new file mode 100644 index 000000000..0fa70b09f --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/doubleDate_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: cdee2276cf3cb364eb1c5ee0f0e38573 +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png b/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png index 32d1ef187..0dd0ff1cc 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png and b/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta index 53e374a89..7d79e3a12 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/fanClub.png.meta @@ -68,7 +68,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +80,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png index 58a22b67b..0558a9bf5 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png and b/Assets/Resources/Sprites/Editor/GameIcons/fanClub_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png b/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png index 44fea6eef..20d392eb0 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png and b/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta index 377e651d6..4b57bb90f 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/gameManager.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png new file mode 100644 index 000000000..4ca7faeec Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta new file mode 100644 index 000000000..810640bfa --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/gameManager_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 0080a91e5366c334da5a829fda89c32e +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties.png b/Assets/Resources/Sprites/Editor/GameIcons/kitties.png new file mode 100644 index 000000000..10ded4334 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/kitties.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/kitties.png.meta new file mode 100644 index 000000000..a0ac4efd0 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/kitties.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 9542c3385961e8340bd082c10f739211 +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png new file mode 100644 index 000000000..61ce00e5c Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta new file mode 100644 index 000000000..49767ed7e --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/kitties_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 2343af644f3d99840967a6c0a320488c +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png index 6fd83861f..56428aa5a 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png and b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta index a0c02993e..69e1d9d02 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png new file mode 100644 index 000000000..3ad9bd53b Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta new file mode 100644 index 000000000..30b4f9373 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/rhythmRally_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 55959685c1d851240bbd5f754908fb3d +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png index 4f5acadf4..9187ccfee 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png and b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta index 4fedaedd2..d9ac05054 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png new file mode 100644 index 000000000..8ce06068c Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta new file mode 100644 index 000000000..487daa06e --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/sneakySpirits_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 842b97bd52929304d9ac3d098b5dda5e +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/vfx.png b/Assets/Resources/Sprites/Editor/GameIcons/vfx.png index 0c573d921..21d3d7d2c 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/vfx.png and b/Assets/Resources/Sprites/Editor/GameIcons/vfx.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta index cb6a180a0..b5b98fe78 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/vfx.png.meta @@ -65,10 +65,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 128 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -77,10 +77,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 128 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png new file mode 100644 index 000000000..21354da27 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta new file mode 100644 index 000000000..915d90149 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/vfx_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: b7c0c13501cdaf347824e75bff542878 +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta index 548ee454d..4e6a1fe57 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png new file mode 100644 index 000000000..17a2479e6 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta new file mode 100644 index 000000000..cc5d3578b --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/wizardsWaltz_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 148e6f16103322d4e9f6f9be1cad50ea +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: 1 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties.meta b/Assets/Resources/Sprites/Games/Kitties.meta new file mode 100644 index 000000000..fa70311d6 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d812fc02280136344b2c9d807eb22853 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations.meta b/Assets/Resources/Sprites/Games/Kitties/Animations.meta new file mode 100644 index 000000000..304afbd5a --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ddb9fd9a4b7b2f44844fc8df28eb800 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller new file mode 100644 index 000000000..d5d26e341 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-331681189392602167 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + 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: 0} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Kitty + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -331681189392602167} + 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} diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller.meta b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller.meta new file mode 100644 index 000000000..5dcd78b1c --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Kitty.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3eab4144c1040f46a1c5a88b1a3fc45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png new file mode 100644 index 000000000..437b9daa3 Binary files /dev/null and b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png differ diff --git a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta new file mode 100644 index 000000000..75585d242 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta @@ -0,0 +1,1692 @@ +fileFormatVersion: 2 +guid: bf45531f01bb98d48809dda2ebe18c81 +TextureImporter: + internalIDToNameTable: + - first: + 213: -5801956193589078948 + second: kittiesIdle_0 + - first: + 213: 608308082974126268 + second: kittiesIdle_1 + - first: + 213: -4739823493371210473 + second: kittiesIdle_2 + - first: + 213: 2714301014034650516 + second: kittiesIdle_3 + - first: + 213: -7681626486337205679 + second: kittiesPopIn_0 + - first: + 213: -1849478282175469088 + second: kittiesPopIn_1 + - first: + 213: 7138334911384288879 + second: kittiesEyebrows_0 + - first: + 213: 5439475645685310803 + second: kittiesClapFX + - first: + 213: -3697540348655772098 + second: kittiesClap_0 + - first: + 213: 2726140473053076307 + second: kittiesClap_4 + - first: + 213: -3414625489340250353 + second: kittiesClapFail + - first: + 213: -4944525377045975221 + second: kittiesSpin_0 + - first: + 213: 2427856040127720591 + second: kittiesSpin_1 + - first: + 213: 8405063258882217834 + second: kittiesFish + - first: + 213: -890089858769695482 + second: kittiesFailFX_0 + - first: + 213: 2450051006318353345 + second: kittiesClap_1 + - first: + 213: 6615670241960667488 + second: kittiesClap_2 + - first: + 213: -4825644759080002611 + second: kittiesClap_3 + - first: + 213: -6672383421258099233 + second: kittiesSpin_2 + - first: + 213: 2961244338457994705 + second: kittiesUnused + - first: + 213: 2491961779969426482 + second: kittiesSpinFail_0 + - first: + 213: 7449070226787453400 + second: kittiesSpinFail_1 + - first: + 213: -3928410681875221782 + second: kittiesSpinFail_2 + - first: + 213: -9147522927102976589 + second: kittiesPopInLine + - first: + 213: -3668567670657479890 + second: kittiesFace_1 + - first: + 213: 364125575587437950 + second: kittiesFace_0 + - first: + 213: -7607118563815519801 + second: kittiesHand + - first: + 213: -4488382681894074449 + second: kittiesSeeFish_1 + - first: + 213: 7394798108583388539 + second: kittiesSeeFish_0 + - first: + 213: -5984737169221637080 + second: kittiesSeeFish_2 + - first: + 213: -7930608780683201851 + second: kittiesActionLines + - first: + 213: 1797786135430993361 + second: kittiesHeart_1 + - first: + 213: 9109945632691231925 + second: kittiesFishSurprise + - first: + 213: -6507884322407430924 + second: kittiesFaceFail_1 + - first: + 213: -6774374335605444397 + second: kittiesFaceFail_0 + - first: + 213: -8465383514614775766 + second: kittiesMouseIdle_0 + - first: + 213: -4829331898434409872 + second: kittiesMouseIdle_2 + - first: + 213: -2180464609782432909 + second: kittiesMousePopIn_0 + - first: + 213: -6711406373093957828 + second: kittiesCatchFish_2 + - first: + 213: -391659831302825775 + second: kittiesCatchFish + - first: + 213: 7153805875199393418 + second: kittiesCatchFishFail + - first: + 213: -6081180138858234797 + second: kittiesCatchFish_0 + - first: + 213: -6967539486268207878 + second: kittiesCatchFail_1 + - first: + 213: 8068771803452085853 + second: kittiesEyebrows_1 + - first: + 213: -6498685018660671736 + second: kittiesEyebrows_2 + - first: + 213: 13554184045283124 + second: kittiesRedFX + - first: + 213: -2023157279334382606 + second: kittiesBackground + - first: + 213: -7937288927019184270 + second: kittiesStar_0 + - first: + 213: -7540619746044756223 + second: kittiesStar_1 + - first: + 213: 5030738185955279627 + second: kittiesStar_2 + - first: + 213: -7540707256061033045 + second: kittiesFailFX_1 + - first: + 213: 7147267099706369679 + second: kittiesMusicNote + - first: + 213: 4313510954544578308 + second: kittiesFishHolder + - first: + 213: 3220635104661186870 + second: kittiesHeart_0 + - first: + 213: 7590593529774598987 + second: kittiesFishLineDangle + - first: + 213: -6088740353780400943 + second: kittiesFishLineStraight + - first: + 213: 7314257033710897882 + second: kittiesMouseIdle_1 + - first: + 213: -1265843907470931862 + second: kittiesMousePopIn_1 + - first: + 213: -3168832477043077438 + second: kittiesMouseClap_0 + - first: + 213: -421213860102571549 + second: kittiesMouseClap_1 + - first: + 213: 4059413026682354504 + second: kittiesMouseClap_2 + - first: + 213: -6628612134585453162 + second: kittiesCatchFish_1 + - first: + 213: -3642517504267728846 + second: kittiesCatchFail_0 + 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: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Lumin + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: tvOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: kittiesIdle_0 + rect: + serializedVersion: 2 + x: 0 + y: 3510.8572 + width: 455.1111 + height: 585.1429 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c54debef49f4b7fa0800000000000000 + internalID: -5801956193589078948 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesIdle_1 + rect: + serializedVersion: 2 + x: 910 + y: 3510.8572 + width: 455.1111 + height: 585.1429 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cb0fbaf7af4217800800000000000000 + internalID: 608308082974126268 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesIdle_2 + rect: + serializedVersion: 2 + x: 1365 + y: 3510.8572 + width: 455.1111 + height: 585.1429 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 715de8b35a3c83eb0800000000000000 + internalID: -4739823493371210473 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesIdle_3 + rect: + serializedVersion: 2 + x: 1820 + y: 3510.8572 + width: 455.1111 + height: 585.1429 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 495940b24622ba520800000000000000 + internalID: 2714301014034650516 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesPopIn_0 + rect: + serializedVersion: 2 + x: 2275 + y: 3510.8572 + width: 455.1111 + height: 585.1429 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 15a83a0e861656590800000000000000 + internalID: -7681626486337205679 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesPopIn_1 + rect: + serializedVersion: 2 + x: 2730 + y: 3510.8572 + width: 455.1111 + height: 585.1429 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0e9a1232d455556e0800000000000000 + internalID: -1849478282175469088 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesEyebrows_0 + rect: + serializedVersion: 2 + x: 3185 + y: 3916 + width: 455 + height: 180 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f6e74d808c5701360800000000000000 + internalID: 7138334911384288879 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesClapFX + rect: + serializedVersion: 2 + x: 3647 + y: 3857 + width: 128 + height: 161 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3552679b746ec7b40800000000000000 + internalID: 5439475645685310803 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesClap_0 + rect: + serializedVersion: 2 + x: 0 + y: 2941 + width: 455 + height: 570 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e3ed2bfa4a2bfacc0800000000000000 + internalID: -3697540348655772098 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesClap_4 + rect: + serializedVersion: 2 + x: 455 + y: 2941 + width: 455 + height: 570 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 35bd428015235d520800000000000000 + internalID: 2726140473053076307 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesClapFail + rect: + serializedVersion: 2 + x: 910 + y: 2941 + width: 455 + height: 570 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f0741ea7530dc90d0800000000000000 + internalID: -3414625489340250353 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSpin_0 + rect: + serializedVersion: 2 + x: 1815 + y: 2935 + width: 455 + height: 577 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b4f2546ed54816bb0800000000000000 + internalID: -4944525377045975221 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSpin_1 + rect: + serializedVersion: 2 + x: 2275 + y: 2935 + width: 455 + height: 577 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f8c6995843a71b120800000000000000 + internalID: 2427856040127720591 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFish + rect: + serializedVersion: 2 + x: 3235 + y: 3355 + width: 266 + height: 189 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a679c548088c4a470800000000000000 + internalID: 8405063258882217834 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFailFX_0 + rect: + serializedVersion: 2 + x: 3711 + y: 3271 + width: 86 + height: 158 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 60dcad54df3c5a3f0800000000000000 + internalID: -890089858769695482 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesClap_1 + rect: + serializedVersion: 2 + x: 0 + y: 2388 + width: 455 + height: 556 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1cb9139c864500220800000000000000 + internalID: 2450051006318353345 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesClap_2 + rect: + serializedVersion: 2 + x: 457 + y: 2388 + width: 455 + height: 539 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0692033a8059fcb50800000000000000 + internalID: 6615670241960667488 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesClap_3 + rect: + serializedVersion: 2 + x: 910 + y: 2388 + width: 455 + height: 553 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dcb9fc2b8add70db0800000000000000 + internalID: -4825644759080002611 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSpin_2 + rect: + serializedVersion: 2 + x: 1365 + y: 2388 + width: 455 + height: 552 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fd594b251aee663a0800000000000000 + internalID: -6672383421258099233 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesUnused + rect: + serializedVersion: 2 + x: 1820 + y: 2388 + width: 424 + height: 548 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d5ece65904781920800000000000000 + internalID: 2961244338457994705 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSpinFail_0 + rect: + serializedVersion: 2 + x: 2246 + y: 2562 + width: 337 + height: 364 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2348de0390a359220800000000000000 + internalID: 2491961779969426482 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSpinFail_1 + rect: + serializedVersion: 2 + x: 2581 + y: 2562 + width: 404 + height: 364 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8d9ca9687e9606760800000000000000 + internalID: 7449070226787453400 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSpinFail_2 + rect: + serializedVersion: 2 + x: 3053 + y: 2584 + width: 413 + height: 342 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ae23af66c4b7b79c0800000000000000 + internalID: -3928410681875221782 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesPopInLine + rect: + serializedVersion: 2 + x: 3775 + y: 2582 + width: 40 + height: 564 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3bd194b0d587d0180800000000000000 + internalID: -9147522927102976589 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFace_1 + rect: + serializedVersion: 2 + x: 0 + y: 1883 + width: 438 + height: 502 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e2b8af3f321a61dc0800000000000000 + internalID: -3668567670657479890 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFace_0 + rect: + serializedVersion: 2 + x: 438 + y: 1883 + width: 438 + height: 502 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e7d16822842ad0500800000000000000 + internalID: 364125575587437950 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesHand + rect: + serializedVersion: 2 + x: 895 + y: 2049 + width: 123 + height: 338 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7c90f7f68f51e6690800000000000000 + internalID: -7607118563815519801 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSeeFish_1 + rect: + serializedVersion: 2 + x: 1162 + y: 1776 + width: 455 + height: 585 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fa740b53bbf06b1c0800000000000000 + internalID: -4488382681894074449 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSeeFish_0 + rect: + serializedVersion: 2 + x: 1614 + y: 1776 + width: 455 + height: 585 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b75e7df43b99f9660800000000000000 + internalID: 7394798108583388539 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesSeeFish_2 + rect: + serializedVersion: 2 + x: 2072 + y: 1776 + width: 455 + height: 585 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 82ca77ac041f1fca0800000000000000 + internalID: -5984737169221637080 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesActionLines + rect: + serializedVersion: 2 + x: 2663 + y: 1725 + width: 70 + height: 759 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5c2b8c60551d0f190800000000000000 + internalID: -7930608780683201851 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesHeart_1 + rect: + serializedVersion: 2 + x: 3301 + y: 1965 + width: 182 + height: 184 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d59c7017f403f810800000000000000 + internalID: 1797786135430993361 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFishSurprise + rect: + serializedVersion: 2 + x: 3661 + y: 1985 + width: 352 + height: 432 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5bc9eaf49470d6e70800000000000000 + internalID: 9109945632691231925 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFaceFail_1 + rect: + serializedVersion: 2 + x: 0 + y: 1381 + width: 438 + height: 502 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4f4429360b95fa5a0800000000000000 + internalID: -6507884322407430924 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFaceFail_0 + rect: + serializedVersion: 2 + x: 438 + y: 1381 + width: 438 + height: 502 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3d0f6b61f669cf1a0800000000000000 + internalID: -6774374335605444397 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMouseIdle_0 + rect: + serializedVersion: 2 + x: 897 + y: 1569 + width: 150 + height: 207 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a2040f38b8ae48a80800000000000000 + internalID: -8465383514614775766 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMouseIdle_2 + rect: + serializedVersion: 2 + x: 1473 + y: 1565 + width: 158 + height: 208 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 07aaa5ba934cafcb0800000000000000 + internalID: -4829331898434409872 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMousePopIn_0 + rect: + serializedVersion: 2 + x: 1757 + y: 1563 + width: 144 + height: 208 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 37b7b907dfe6db1e0800000000000000 + internalID: -2180464609782432909 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesCatchFish_2 + rect: + serializedVersion: 2 + x: 2107 + y: 909 + width: 404 + height: 526 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c3f1174567b4cd2a0800000000000000 + internalID: -6711406373093957828 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesCatchFish + rect: + serializedVersion: 2 + x: 65 + y: 52 + width: 654 + height: 839 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1d8d762657b809af0800000000000000 + internalID: -391659831302825775 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesCatchFishFail + rect: + serializedVersion: 2 + x: 861 + y: 67 + width: 650 + height: 1024 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a8ebc5f7a8c674360800000000000000 + internalID: 7153805875199393418 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesCatchFish_0 + rect: + serializedVersion: 2 + x: 1757 + y: 937 + width: 224 + height: 500 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 35cb13812ee4b9ba0800000000000000 + internalID: -6081180138858234797 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesCatchFail_1 + rect: + serializedVersion: 2 + x: 2595 + y: 27 + width: 318 + height: 534 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: afcc97ab0c35e4f90800000000000000 + internalID: -6967539486268207878 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesEyebrows_1 + rect: + serializedVersion: 2 + x: 3185 + y: 3736 + width: 455 + height: 180 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d56137e74390aff60800000000000000 + internalID: 8068771803452085853 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesEyebrows_2 + rect: + serializedVersion: 2 + x: 3185 + y: 3555 + width: 455 + height: 180 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 80fe393386800d5a0800000000000000 + internalID: -6498685018660671736 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesRedFX + rect: + serializedVersion: 2 + x: 3659 + y: 3545 + width: 126 + height: 161 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4374d356577203000800000000000000 + internalID: 13554184045283124 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesBackground + rect: + serializedVersion: 2 + x: 3933 + y: 3805 + width: 134 + height: 134 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2f347807c2d4ce3e0800000000000000 + internalID: -2023157279334382606 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesStar_0 + rect: + serializedVersion: 2 + x: 3942 + y: 3619 + width: 89 + height: 92 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 27f416146c519d190800000000000000 + internalID: -7937288927019184270 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesStar_1 + rect: + serializedVersion: 2 + x: 3935 + y: 3393 + width: 102 + height: 90 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 10fb4bafa465a5790800000000000000 + internalID: -7540619746044756223 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesStar_2 + rect: + serializedVersion: 2 + x: 3929 + y: 3165 + width: 98 + height: 77 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b038bd3e9b5c0d540800000000000000 + internalID: 5030738185955279627 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFailFX_1 + rect: + serializedVersion: 2 + x: 3971 + y: 2915 + width: 54 + height: 114 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ba58547f3b60a5790800000000000000 + internalID: -7540707256061033045 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMusicNote + rect: + serializedVersion: 2 + x: 3971 + y: 2701 + width: 56 + height: 78 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f86a5d03f81303360800000000000000 + internalID: 7147267099706369679 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFishHolder + rect: + serializedVersion: 2 + x: 3613 + y: 2602 + width: 50 + height: 213 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 40fb264fb5bacdb30800000000000000 + internalID: 4313510954544578308 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesHeart_0 + rect: + serializedVersion: 2 + x: 3309 + y: 2308 + width: 182 + height: 185 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 639ab74609ef1bc20800000000000000 + internalID: 3220635104661186870 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFishLineDangle + rect: + serializedVersion: 2 + x: 2865 + y: 1964 + width: 132 + height: 525 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b4be7904994375960800000000000000 + internalID: 7590593529774598987 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesFishLineStraight + rect: + serializedVersion: 2 + x: 3133 + y: 1907 + width: 26 + height: 594 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1dc355368e2708ba0800000000000000 + internalID: -6088740353780400943 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMouseIdle_1 + rect: + serializedVersion: 2 + x: 1179 + y: 1566 + width: 154 + height: 207 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ada8d320506718560800000000000000 + internalID: 7314257033710897882 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMousePopIn_1 + rect: + serializedVersion: 2 + x: 2043 + y: 1565 + width: 144 + height: 206 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a684a124ca1de6ee0800000000000000 + internalID: -1265843907470931862 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMouseClap_0 + rect: + serializedVersion: 2 + x: 891 + y: 1213 + width: 156 + height: 206 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2ce402db6ab0604d0800000000000000 + internalID: -3168832477043077438 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMouseClap_1 + rect: + serializedVersion: 2 + x: 1177 + y: 1213 + width: 170 + height: 212 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3e97d16d93c872af0800000000000000 + internalID: -421213860102571549 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesMouseClap_2 + rect: + serializedVersion: 2 + x: 1467 + y: 1212 + width: 168 + height: 207 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 84bbefbd3aee55830800000000000000 + internalID: 4059413026682354504 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesCatchFish_1 + rect: + serializedVersion: 2 + x: 1637 + y: 542 + width: 348 + height: 298 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 695b03c22607204a0800000000000000 + internalID: -6628612134585453162 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: kittiesCatchFail_0 + rect: + serializedVersion: 2 + x: 2109 + y: 237 + width: 352 + height: 526 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 238caf5f0ad237dc0800000000000000 + internalID: -3642517504267728846 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index f9f1724e5..fa3898027 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -265,6 +265,23 @@ namespace HeavenStudio return GameManager.instance.Beatmap.tempoChanges; } + public float GetBpmAtBeat(float beat) + { + var chart = GameManager.instance.Beatmap; + float bpm = chart.bpm; + + foreach (DynamicBeatmap.TempoChange t in GameManager.instance.Beatmap.tempoChanges) + { + if (t.beat > beat) + { + break; + } + bpm = t.tempo; + } + + return bpm; + } + public double GetSongPosFromBeat(double beat) { var chart = GameManager.instance.Beatmap; @@ -292,11 +309,11 @@ namespace HeavenStudio } //thank you @wooningcharithri#7419 for the psuedo-code - private double BeatsToSecs(double beats, float bpm) + public double BeatsToSecs(double beats, float bpm) { return beats / bpm * 60f; } - private double SecsToBeats(double s, float bpm) + public double SecsToBeats(double s, float bpm) { return s / 60f * bpm; } diff --git a/Assets/Scripts/Games/BlueBear/BlueBear.cs b/Assets/Scripts/Games/BlueBear/BlueBear.cs index 6ffee5cdc..67d8597c1 100644 --- a/Assets/Scripts/Games/BlueBear/BlueBear.cs +++ b/Assets/Scripts/Games/BlueBear/BlueBear.cs @@ -68,11 +68,11 @@ namespace HeavenStudio.Games { headAndBodyAnim.SetBool("ShouldOpenMouth", foodHolder.childCount != 0); - if (PlayerInput.GetAnyDirectionDown()) + if (PlayerInput.GetAnyDirectionDown() && !IsExpectingInputNow(InputType.DIRECTION_DOWN)) { headAndBodyAnim.Play("BiteL", 0, 0); } - else if (PlayerInput.Pressed()) + else if (PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) { headAndBodyAnim.Play("BiteR", 0, 0); } diff --git a/Assets/Scripts/Games/BlueBear/Treat.cs b/Assets/Scripts/Games/BlueBear/Treat.cs index f338c00ec..f528032a8 100644 --- a/Assets/Scripts/Games/BlueBear/Treat.cs +++ b/Assets/Scripts/Games/BlueBear/Treat.cs @@ -25,8 +25,12 @@ namespace HeavenStudio.Games.Scripts_BlueBear private void Awake() { game = BlueBear.instance; + } + private void Start() + { flyBeats = isCake ? 3f : 2f; + game.ScheduleInput(startBeat, flyBeats, isCake ? InputType.DIRECTION_DOWN : InputType.STANDARD_DOWN, Just, Out, Out); } private void Update() @@ -47,46 +51,9 @@ namespace HeavenStudio.Games.Scripts_BlueBear float rot = isCake ? rotSpeed : -rotSpeed; transform.rotation = Quaternion.Euler(0, 0, transform.rotation.eulerAngles.z + (rot * Time.deltaTime)); - - float normalizedBeat = cond.GetPositionFromMargin(startBeat + flyBeats, 1f); - StateCheck(normalizedBeat); - - if (PlayerInput.Pressed()) - { - if (!isCake) - { - if (state.perfect) - { - flying = false; - - Jukebox.PlayOneShotGame("blueBear/chompDonut"); - - SpawnCrumbs(); - - GameObject.Destroy(gameObject); - } - } - } - else if (PlayerInput.GetAnyDirection()) - { - if (isCake) - { - if (state.perfect) - { - flying = false; - - Jukebox.PlayOneShotGame("blueBear/chompCake"); - - SpawnCrumbs(); - - GameObject.Destroy(gameObject); - } - } - } } } - - public override void OnAce() + void EatFood() { flying = false; @@ -106,6 +73,26 @@ namespace HeavenStudio.Games.Scripts_BlueBear GameObject.Destroy(gameObject); } + private void Just(PlayerActionEvent caller, float state) + { + if (state >= 1f || state <= -1f) { //todo: proper near miss feedback + if (isCake) + { + game.headAndBodyAnim.Play("BiteL", 0, 0); + } + else + { + game.headAndBodyAnim.Play("BiteR", 0, 0); + } + return; + } + EatFood(); + } + + private void Miss(PlayerActionEvent caller) {} + + private void Out(PlayerActionEvent caller) {} + void SpawnCrumbs() { var crumbsGO = GameObject.Instantiate(game.crumbsBase, game.crumbsHolder); diff --git a/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs index 7f821a7b4..6e9d81ddd 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/Blocks.cs @@ -14,60 +14,74 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleDS private bool moving = true; private BuiltToScaleDS game; + float windupBeat; + float hitBeat; + float sinkBeat; private void Awake() { game = BuiltToScaleDS.instance; + + } + + private void Start() + { + windupBeat = createBeat + (createLength * 4f); + hitBeat = windupBeat + createLength; + sinkBeat = hitBeat + (createLength * 2f); + + game.ScheduleInput(windupBeat, createLength, InputType.STANDARD_DOWN, Just, Miss, Out); } private void Update() { if (!moving) return; - - var windupBeat = createBeat + (createLength * 4f); - var hitBeat = windupBeat + createLength; - var currentBeat = Conductor.instance.songPositionInBeats; + float currentBeat = Conductor.instance.songPositionInBeats; var shooterState = game.shooterAnim.GetCurrentAnimatorStateInfo(0); if (currentBeat > windupBeat && currentBeat < hitBeat && !shooterState.IsName("Windup") - && game.shooterAnim.IsAnimationNotPlaying()) + && !game.lastShotOut) { game.shooterAnim.Play("Windup", 0, 0); } - float stateBeat = Conductor.instance.GetPositionFromMargin(hitBeat, 2f); - StateCheck(stateBeat); - - if (PlayerInput.Pressed()) - { - if (state.perfect) - { - Ace(); - } - else if (state.notPerfect()) - { - Miss(); - } - } - - if (moving) - { - var sinkBeat = hitBeat + (createLength * 2f); - - if (currentBeat < sinkBeat) - { - game.SetBlockTime(this, createBeat, createLength); - } - else - { - moving = false; - Jukebox.PlayOneShotGame("builtToScaleDS/Sink"); - } - } + if (moving && currentBeat < sinkBeat) + game.SetBlockTime(this, createBeat, createLength); } - void Ace() + private void Just(PlayerActionEvent caller, float state) + { + var shooterState = game.shooterAnim.GetCurrentAnimatorStateInfo(0); + if (!shooterState.IsName("Windup")) return; + + // near miss + if (state >= 1f || state <= -1f) { + NearMiss(); + return; + } + // hit + Hit(); + } + + private void Miss(PlayerActionEvent caller) + { + float sinkBeat = hitBeat + (createLength * 2f); + MultiSound.Play( + new MultiSound.Sound[] { + new MultiSound.Sound("builtToScaleDS/Sink", sinkBeat), + }, forcePlay: true + ); + + BeatAction.New(this.gameObject, new List() + { + new BeatAction.Action(sinkBeat, delegate { moving = false; }), + }); + } + + private void Out(PlayerActionEvent caller) {} + + void Hit() { moving = false; game.shootingThisFrame = true; @@ -79,7 +93,7 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleDS Jukebox.PlayOneShotGame("builtToScaleDS/Hit"); } - void Miss() + void NearMiss() { moving = false; game.shootingThisFrame = true; @@ -90,10 +104,5 @@ namespace HeavenStudio.Games.Scripts_BuiltToScaleDS Jukebox.PlayOneShotGame("builtToScaleDS/Crumble"); } - - public override void OnAce() - { - Ace(); - } } } \ No newline at end of file diff --git a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs index eca6583c7..fae48ae69 100644 --- a/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs +++ b/Assets/Scripts/Games/BuiltToScaleDS/BuiltToScaleDS.cs @@ -65,6 +65,7 @@ namespace HeavenStudio.Games private float currentBeltOffset; [NonSerialized] public bool shootingThisFrame; + [NonSerialized] public bool lastShotOut = false; public static BuiltToScaleDS instance; @@ -118,10 +119,14 @@ namespace HeavenStudio.Games void LateUpdate() { var shooterState = shooterAnim.GetCurrentAnimatorStateInfo(0); - bool canShoot = !shooterState.IsName("Shoot") || shooterAnim.IsAnimationNotPlaying(); + bool canShoot = (!shooterState.IsName("Shoot") || shooterAnim.IsAnimationNotPlaying()) && !shootingThisFrame; - if (canShoot && PlayerInput.Pressed() && !shootingThisFrame) + if (canShoot && lastShotOut) + lastShotOut = false; + + if (canShoot && !lastShotOut && PlayerInput.Pressed() && !IsExpectingInputNow(InputType.STANDARD_DOWN)) { + lastShotOut = true; shootingThisFrame = true; Shoot(); SpawnObject(BTSObject.FlyingRod); diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs index 2e1d94adc..b43cea3b8 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs @@ -72,9 +72,13 @@ namespace HeavenStudio.Games public static ClappyTrio instance { get; set; } + MultiSound clapSounds = null; + BeatAction clapAction = null; + private void Awake() { instance = this; + clapSounds = null; InitLions(); } public override void OnGameSwitch(float beat) @@ -108,52 +112,16 @@ namespace HeavenStudio.Games ClappyTrioPlayer = lion.AddComponent(); } + if (clapSounds != null) + clapSounds.Delete(); + + if (clapAction != null) + clapAction.Delete(); } private void Update() { - if (isClapping) - { - float songPosBeat = Conductor.instance.songPositionInBeats; - for (int i = 0; i < Lion.Count; i++) - { - float length = currentClappingLength * (i); - float lengthplusone = (currentClappingLength * (i + 1)); - - // i spent like 25 minutes trying to figure out what was wrong with this when i forgot to subtract the currentClapLength :( - if (i == Lion.Count - 1) - { - length = 0; - } - - if (songPosBeat > lastClapStart + length && songPosBeat < lastClapStart + lengthplusone && clapIndex == i) - { - if (i == Lion.Count - 1) - { - ClappyTrioPlayer.SetClapAvailability(lastClapStart + (currentClappingLength * (i - 1)), currentClappingLength); - - clapIndex = 0; - isClapping = false; - currentClappingLength = 0; - ClappyTrioPlayer.clapStarted = false; - } else - { - SetFace(i, 4); - Lion[i].GetComponent().Play("Clap", 0, 0); - - // lazy fix rn - if (i > 0) - Jukebox.PlayOneShotGame("clappyTrio/middleClap"); - else - Jukebox.PlayOneShotGame("clappyTrio/leftClap"); - - clapIndex++; - } - break; - } - } - } } public void Clap(float beat, float length) @@ -163,8 +131,21 @@ namespace HeavenStudio.Games playerHitLast = false; isClapping = true; - lastClapStart = beat; - currentClappingLength = length; + + // makes the other lions clap + List sounds = new List(); + List actions = new List(); + for (int i = 0; i < Lion.Count - 1; i++) + { + int idx = i; + sounds.Add(new MultiSound.Sound((i > 0) ? "clappyTrio/middleClap" : "clappyTrio/leftClap", beat + (length * i))); + actions.Add(new BeatAction.Action(beat + (length * i), delegate { SetFace(idx, 4); Lion[idx].GetComponent().Play("Clap", 0, 0);})); + } + clapSounds = MultiSound.Play(sounds.ToArray()); + clapAction = BeatAction.New(this.gameObject, actions); + + // prepare player input + ClappyTrioPlayer.QueueClap(beat, length * (Lion.Count - 1)); } public void Prepare(int type) diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs index 0b7a27b49..f4466c28d 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrioPlayer.cs @@ -8,84 +8,81 @@ namespace HeavenStudio.Games.Scripts_ClappyTrio { public class ClappyTrioPlayer : PlayerActionObject { + ClappyTrio game; private float lastClapBeat; private float lastClapLength; - [SerializeField] private bool clapVacant; public bool clapStarted = false; public bool canHit; private GameObject clapEffect; - new int aceTimes = 0; private void Awake() { + game = ClappyTrio.instance; clapEffect = transform.GetChild(4).GetChild(3).gameObject; } - public override void OnAce() - { - if (aceTimes == 0) - { - Clap(true); - aceTimes++; - } - } - private void Update() { - if (clapVacant == true) - { - float normalizedBeat = (Conductor.instance.GetPositionFromBeat(lastClapBeat, lastClapLength)); - - StateCheck(normalizedBeat); - - if (normalizedBeat > Minigame.EndTime()) - { - clapVacant = false; - lastClapLength = 0; - lastClapBeat = 0; - } - } - - if (PlayerInput.Pressed()) + if (PlayerInput.Pressed() && !game.IsExpectingInputNow(InputType.STANDARD_DOWN)) { Clap(false); } - } - public void SetClapAvailability(float startBeat, float length) + public void QueueClap(float startBeat, float length) { - aceTimes = 0; lastClapBeat = startBeat; - clapVacant = true; lastClapLength = length; - ResetState(); + game.ScheduleInput(startBeat, length, InputType.STANDARD_DOWN, Just, Miss, Out); } - private void Clap(bool overrideCanHit) + private void Just(PlayerActionEvent caller, float state) { - if (state.early || state.perfect || overrideCanHit) + if (!canHit) { + Clap(false); + return; + } + if (state >= 1f || state <= -1f) { //todo: proper near miss feedback + Clap(false); + return; + } + Clap(true); + } + + private void Miss(PlayerActionEvent caller) { + game.playerHitLast = false; + + if (clapStarted) + this.canHit = false; + } + + private void Out(PlayerActionEvent caller) {} + + private void Clap(bool just) + { + if (just) { clapEffect.SetActive(true); Jukebox.PlayOneShotGame("clappyTrio/rightClap"); if (this.canHit) - ClappyTrio.instance.playerHitLast = true; + game.playerHitLast = true; } else { clapEffect.SetActive(false); Jukebox.PlayOneShot("miss"); - ClappyTrio.instance.playerHitLast = false; + game.playerHitLast = false; if (clapStarted) this.canHit = false; } - ClappyTrio.instance.SetFace(ClappyTrio.instance.Lion.Count - 1, 4); + clapStarted = false; + game.SetFace(game.Lion.Count - 1, 4); this.GetComponent().Play("Clap", 0, 0); } } diff --git a/Assets/Scripts/Games/CropStomp/CropStomp.cs b/Assets/Scripts/Games/CropStomp/CropStomp.cs index 7b00ed7d2..37694adf3 100644 --- a/Assets/Scripts/Games/CropStomp/CropStomp.cs +++ b/Assets/Scripts/Games/CropStomp/CropStomp.cs @@ -130,7 +130,7 @@ namespace HeavenStudio.Games // Cue the marching proper to begin when applicable. BeatAction.New(gameObject, new List() { - new BeatAction.Action(startBeat, delegate { StartMarching(startBeat); }) + new BeatAction.Action(startBeat - 0.25f, delegate { StartMarching(startBeat); }) }); inactiveStart = -1f; @@ -208,7 +208,7 @@ namespace HeavenStudio.Games PlayAnims(); if (currentMarchBeat % 2 != 0) //step sound { - Jukebox.PlayOneShotGame("cropStomp/hmm"); + MultiSound.Play(new MultiSound.Sound[] {new MultiSound.Sound("cropStomp/hmm", newBeat + marchOffset)}); } } diff --git a/Assets/Scripts/Games/CropStomp/Farmer.cs b/Assets/Scripts/Games/CropStomp/Farmer.cs index a8f82403a..37e3938f7 100644 --- a/Assets/Scripts/Games/CropStomp/Farmer.cs +++ b/Assets/Scripts/Games/CropStomp/Farmer.cs @@ -12,6 +12,8 @@ namespace HeavenStudio.Games.Scripts_CropStomp private CropStomp game; + PlayerActionEvent stomp; + public void Init() { game = CropStomp.instance; @@ -21,38 +23,56 @@ namespace HeavenStudio.Games.Scripts_CropStomp { if (!game.isMarching) return; - - float normalizedBeat = Conductor.instance.GetPositionFromMargin(nextStompBeat, 1f); + Conductor cond = Conductor.instance; - StateCheck(normalizedBeat); - - if (normalizedBeat > Minigame.LateTime()) + if (stomp == null) { - nextStompBeat += 2f; - ResetState(); + if (GameManager.instance.currentGame == "cropStomp") + stomp = game.ScheduleUserInput(nextStompBeat - 1f, 1f, InputType.STANDARD_DOWN, Just, Miss, Out); + } + + if (PlayerInput.Pressed() && !game.IsExpectingInputNow(InputType.STANDARD_DOWN)) + { + game.bodyAnim.Play("Crouch", 0, 0); + } + } + + private void Just(PlayerActionEvent caller, float state) + { + // REMARK: does not count for performance + Stomp(state >= 1f || state <= -1f); + } + + private void Miss(PlayerActionEvent caller) + { + if (GameManager.instance.currentGame != "cropStomp") return; + if (!game.isMarching) return; - } + // REMARK: does not count for performance + nextStompBeat += 2f; + stomp?.Disable(); + stomp = game.ScheduleUserInput(nextStompBeat - 1f, 1f, InputType.STANDARD_DOWN, Just, Miss, Out); + } - if (PlayerInput.Pressed()) + private void Out(PlayerActionEvent caller) {} + + void Stomp(bool ng) + { + if (GameManager.instance.currentGame != "cropStomp") return; + if (!game.isMarching) + return; + if (ng) { - if (state.perfect) - { - game.Stomp(); - game.bodyAnim.Play("Stomp", 0, 0); - nextStompBeat += 2f; - ResetState(); - } - else if (state.notPerfect()) - { - game.bodyAnim.Play("Crouch", 0, 0); - nextStompBeat += 2f; - ResetState(); - } - else - { - game.bodyAnim.Play("Crouch", 0, 0); - } + game.bodyAnim.Play("Crouch", 0, 0); } + else + { + game.Stomp(); + game.bodyAnim.Play("Stomp", 0, 0); + } + nextStompBeat += 2f; + stomp?.Disable(); + stomp = game.ScheduleUserInput(nextStompBeat - 1f, 1f, InputType.STANDARD_DOWN, Just, Miss, Out); } } } diff --git a/Assets/Scripts/Games/CropStomp/Veggie.cs b/Assets/Scripts/Games/CropStomp/Veggie.cs index bfbec80d2..aa35dfe68 100644 --- a/Assets/Scripts/Games/CropStomp/Veggie.cs +++ b/Assets/Scripts/Games/CropStomp/Veggie.cs @@ -26,6 +26,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp private float pickTime = 1f; private int veggieState = 0; private bool boinked; // Player got barely when trying to pick. + private bool pickEligible = true; private float landBeat; @@ -36,6 +37,7 @@ namespace HeavenStudio.Games.Scripts_CropStomp public void Init() { game = CropStomp.instance; + game.ScheduleInput(targetBeat - 1, 1f, InputType.STANDARD_DOWN, StompJust, StompMiss, Out); if (!isMole) { @@ -68,30 +70,9 @@ namespace HeavenStudio.Games.Scripts_CropStomp } var cond = Conductor.instance; - - float normalizedBeat = cond.GetPositionFromMargin(targetBeat, 1f); - StateCheck(normalizedBeat); - // In ground. if (veggieState == 0) { - if (normalizedBeat > Minigame.LateTime()) - { - veggieState = -1; - return; - } - - if (PlayerInput.Pressed()) - { - if (state.perfect) - { - StompVeggie(false); - } - else if (state.notPerfect()) - { - veggieState = -1; - } - } } // In air. else if (veggieState == 1) @@ -99,50 +80,82 @@ namespace HeavenStudio.Games.Scripts_CropStomp float airPosition = cond.GetPositionFromBeat(stompedBeat, landBeat - stompedBeat); veggieTrans.position = curve.GetPoint(Mathf.Clamp(airPosition, 0, 1)); - if (normalizedBeat > Minigame.EndTime()) + if (PlayerInput.PressedUp() && !game.IsExpectingInputNow(InputType.STANDARD_UP)) { - veggieState = -1; - - if (!isMole) - Jukebox.PlayOneShotGame("cropStomp/veggieMiss"); - - return; - } - - if (PlayerInput.PressedUp()) - { - if (state.perfect) - { - PickVeggie(false); - } - else if (state.notPerfect()) - { - veggieState = -1; - boinked = true; - - curve.transform.localScale = Vector3.one; // Return curve to normal size in the case of mole curves. - - var key1 = curve.KeyPoints[0]; - var key1Pos = key1.Position; - key1.Position = new Vector3(key1Pos.x, veggieTrans.position.y, key1Pos.z); - - var key2 = curve.KeyPoints[1]; - var key2Pos = key2.Position; - key2.Position = new Vector3(key2Pos.x, veggieTrans.position.y + 2f, key2Pos.z); - - pickedBeat = cond.songPositionInBeats; - - Jukebox.PlayOneShot("miss"); - - MissedUpdate(); - } - - game.bodyAnim.Play("Pick", 0, 0); - game.isFlicking = true; + pickEligible = false; } } } + private void StompJust(PlayerActionEvent caller, float state) + { + if (GameManager.instance.autoplay) + { + StompVeggie(true); + return; + } + + if (state >= 1f) + veggieState = -1; + else if (state > -1f) + StompVeggie(false); + } + + private void StompMiss(PlayerActionEvent caller) + { + veggieState = -1; + caller.Disable(); + } + + private void Out(PlayerActionEvent caller) {} + + private void PickJust(PlayerActionEvent caller, float state) + { + game.bodyAnim.Play("Pick", 0, 0); + game.isFlicking = true; + if (!pickEligible) return; + if (GameManager.instance.autoplay) + { + PickVeggie(true); + return; + } + + if (state <= -1f || state >= 1f) + { + veggieState = -1; + boinked = true; + + curve.transform.localScale = Vector3.one; // Return curve to normal size in the case of mole curves. + + var key1 = curve.KeyPoints[0]; + var key1Pos = key1.Position; + key1.Position = new Vector3(key1Pos.x, veggieTrans.position.y, key1Pos.z); + + var key2 = curve.KeyPoints[1]; + var key2Pos = key2.Position; + key2.Position = new Vector3(key2Pos.x, veggieTrans.position.y + 2f, key2Pos.z); + + pickedBeat = Conductor.instance.songPositionInBeats; + + Jukebox.PlayOneShot("miss"); + + MissedUpdate(); + } + else + { + PickVeggie(false); + } + } + + private void PickMiss(PlayerActionEvent caller) + { + veggieState = -1; + + if (!isMole) + Jukebox.PlayOneShotGame("cropStomp/veggieMiss"); + caller.Disable(); + } + bool moleLaughing; private void MissedUpdate() { @@ -205,11 +218,12 @@ namespace HeavenStudio.Games.Scripts_CropStomp var cond = Conductor.instance; veggieState = 1; + game.ScheduleInput(targetBeat, isMole ? 0.5f : 1f, InputType.STANDARD_UP, PickJust, PickMiss, Out); targetBeat = targetBeat + (isMole ? 0.5f : 1f); stompedBeat = cond.songPositionInBeats; - landBeat = cond.GetBeatFromPositionAndMargin(Minigame.EndTime(), targetBeat, 1f); + landBeat = targetBeat + (float)cond.BeatsToSecs(Minigame.EndTime()-1, cond.GetBpmAtBeat(targetBeat)); if (autoTriggered) { @@ -219,10 +233,9 @@ namespace HeavenStudio.Games.Scripts_CropStomp if (!isMole) { - BeatAction.New(gameObject, new List() - { - new BeatAction.Action(targetBeat - 0.5f, delegate { Jukebox.PlayOneShotGame("cropStomp/veggieOh"); }) - }); + MultiSound.Play( + new MultiSound.Sound[] { new MultiSound.Sound("cropStomp/veggieOh", targetBeat - 0.5f) } + ); } else { @@ -233,8 +246,6 @@ namespace HeavenStudio.Games.Scripts_CropStomp veggieTrans.localScale = new Vector3(veggieScale.x * 0.5f, veggieScale.y, veggieScale.z); squashTween = veggieTrans.DOScaleX(veggieScale.x, cond.pitchedSecPerBeat * 0.5f); - ResetState(); - Update(); // Update flying veggie state immediately. } @@ -283,13 +294,5 @@ namespace HeavenStudio.Games.Scripts_CropStomp PickedUpdate(); } - - public override void OnAce() - { - if (veggieState == 0) - StompVeggie(true); - else - PickVeggie(true); - } } } diff --git a/Assets/Scripts/Games/DrummingPractice/Drummer.cs b/Assets/Scripts/Games/DrummingPractice/Drummer.cs index a8f47d668..b13fa8364 100644 --- a/Assets/Scripts/Games/DrummingPractice/Drummer.cs +++ b/Assets/Scripts/Games/DrummingPractice/Drummer.cs @@ -10,6 +10,7 @@ namespace HeavenStudio.Games.Scripts_DrummingPractice { public class Drummer : MonoBehaviour { + DrummingPractice game; [Header("References")] public Animator animator; @@ -32,9 +33,14 @@ namespace HeavenStudio.Games.Scripts_DrummingPractice public List Sprites; } + void Awake() + { + game = DrummingPractice.instance; + } + private void Update() { - if (player && PlayerInput.Pressed()) + if (player && PlayerInput.Pressed() && !DrummingPractice.instance.IsExpectingInputNow(InputType.STANDARD_DOWN)) { Hit(false, false); } @@ -107,6 +113,5 @@ namespace HeavenStudio.Games.Scripts_DrummingPractice { hitting = false; } - } } \ No newline at end of file diff --git a/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs index 6e5905c63..7b2c3e77a 100644 --- a/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs +++ b/Assets/Scripts/Games/DrummingPractice/DrummerHit.cs @@ -8,66 +8,70 @@ namespace HeavenStudio.Games.Scripts_DrummingPractice { public class DrummerHit : PlayerActionObject { + DrummingPractice game; public float startBeat; public bool applause = true; - private bool hit = false; - private bool hasHit = false; // Start is called before the first frame update void Awake() { - PlayerActionInit(gameObject, startBeat); + game = DrummingPractice.instance; } - public override void OnAce() - { - Hit(true); + void Start() + { + game.ScheduleInput(startBeat, 1f, InputType.STANDARD_DOWN, Just, Miss, Out); + + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(startBeat+1f, delegate { + Jukebox.PlayOneShotGame("drummingPractice/drum"); + game.leftDrummer.Hit(true, false); + game.rightDrummer.Hit(true, false); + }), + }); } // Update is called once per frame - void Update() + void Update() { } + + private void Just(PlayerActionEvent caller, float state) { - if (Conductor.instance.GetPositionFromBeat(startBeat, 2) >= 1) - { - DrummingPractice.instance.SetFaces(0); - CleanUp(); - } - - if (!hit && Conductor.instance.GetPositionFromBeat(startBeat, 1) >= 1) - { - Jukebox.PlayOneShotGame("drummingPractice/drum"); - DrummingPractice.instance.leftDrummer.Hit(true, false); - DrummingPractice.instance.rightDrummer.Hit(true, false); - hit = true; - if (hasHit) CleanUp(); - } - - float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 1f); - StateCheck(normalizedBeat); - - if (PlayerInput.Pressed()) - { - if (state.perfect) - { - Hit(true); - } else if (state.notPerfect()) - { - Hit(false); - } + if (state >= 1f || state <= -1f) { + Hit(false); } + Hit(true); } + private void Miss(PlayerActionEvent caller) + { + game.SetFaces(2); + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(startBeat+2f, delegate { + game.SetFaces(0); + }) + }); + CleanUp(); + } + + private void Out(PlayerActionEvent caller) {} + public void Hit(bool _hit) { - if (!hasHit) + game.player.Hit(_hit, applause, true); + game.SetFaces(_hit ? 1 : 2); + + if (!_hit) { - DrummingPractice.instance.player.Hit(_hit, applause, true); - DrummingPractice.instance.SetFaces(_hit ? 1 : 2); - - hasHit = true; - - if (hit) CleanUp(); + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(startBeat+2f, delegate { + game.SetFaces(0); + }), + }); } + CleanUp(); } public void CleanUp() diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs index 83547c452..9440ba4e2 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs @@ -34,8 +34,6 @@ namespace HeavenStudio.Games.Scripts_ForkLifter private bool isEating = false; - public int hitOnFrame; - // Burger shit public bool topbun, middleburger, bottombun; @@ -50,14 +48,11 @@ namespace HeavenStudio.Games.Scripts_ForkLifter private void LateUpdate() { - if (PlayerInput.Pressed()) + if (PlayerInput.Pressed() && !ForkLifter.instance.IsExpectingInputNow(InputType.STANDARD_DOWN)) { - hitOnFrame = 0; Stab(null); } - // print(hitOnFrame); - if (ForkLifter.instance.EligibleHits.Count == 0) { currentHitInList = 0; @@ -119,7 +114,7 @@ namespace HeavenStudio.Games.Scripts_ForkLifter public void Stab(Pea p) { - if (isEating || hitOnFrame > 0) return; + if (isEating) return; if (p == null) { diff --git a/Assets/Scripts/Games/ForkLifter/Pea.cs b/Assets/Scripts/Games/ForkLifter/Pea.cs index e315c9317..293e9ab76 100644 --- a/Assets/Scripts/Games/ForkLifter/Pea.cs +++ b/Assets/Scripts/Games/ForkLifter/Pea.cs @@ -10,6 +10,7 @@ namespace HeavenStudio.Games.Scripts_ForkLifter { public class Pea : PlayerActionObject { + ForkLifter game; private Animator anim; public float startBeat; @@ -18,6 +19,7 @@ namespace HeavenStudio.Games.Scripts_ForkLifter private void Awake() { + game = ForkLifter.instance; anim = GetComponent(); // SCHEDULING zoom sound so it lines up with when it meets the fork. @@ -26,21 +28,14 @@ namespace HeavenStudio.Games.Scripts_ForkLifter var zoomStartTime = currentDspTime + (double)(cond.pitchedSecPerBeat * 2) - 0.317; Jukebox.PlayOneShotScheduledGame("forkLifter/zoomFast", (double)zoomStartTime); - GetComponentInChildren().sprite = ForkLifter.instance.peaSprites[type]; + GetComponentInChildren().sprite = game.peaSprites[type]; for (int i = 0; i < transform.GetChild(0).childCount; i++) { transform.GetChild(0).GetChild(i).GetComponent().sprite = transform.GetChild(0).GetComponent().sprite; } - // PlayerActionInit(this.gameObject, startBeat, ForkLifter.instance.EligibleHits); - - isEligible = true; - } - - public override void OnAce() - { - this.Hit(); + game.ScheduleInput(startBeat, 2f, InputType.STANDARD_DOWN, Just, Miss, Out); } public void Hit() @@ -63,7 +58,7 @@ namespace HeavenStudio.Games.Scripts_ForkLifter } SpriteRenderer psprite = pea.AddComponent(); - psprite.sprite = ForkLifter.instance.peaHitSprites[type]; + psprite.sprite = game.peaHitSprites[type]; psprite.sortingOrder = 20; switch (type) { @@ -128,7 +123,7 @@ namespace HeavenStudio.Games.Scripts_ForkLifter } SpriteRenderer psprite = pea.AddComponent(); - psprite.sprite = ForkLifter.instance.peaHitSprites[type]; + psprite.sprite = game.peaHitSprites[type]; psprite.sortingOrder = 20; ForkLifterPlayer.instance.HitFXMiss(new Vector2(1.0424f, -4.032f), new Vector2(1.129612f, 1.129612f)); ForkLifterPlayer.instance.HitFXMiss(new Vector2(0.771f, -3.016f), new Vector2(1.71701f, 1.71701f)); @@ -159,7 +154,7 @@ namespace HeavenStudio.Games.Scripts_ForkLifter } SpriteRenderer psprite = pea.AddComponent(); - psprite.sprite = ForkLifter.instance.peaHitSprites[type]; + psprite.sprite = game.peaHitSprites[type]; psprite.sortingOrder = 20; ForkLifterPlayer.instance.HitFXMiss(new Vector2(1.0424f, -4.032f), new Vector2(1.129612f, 1.129612f)); ForkLifterPlayer.instance.HitFXMiss(new Vector2(0.771f, -3.016f), new Vector2(1.71701f, 1.71701f)); @@ -179,34 +174,35 @@ namespace HeavenStudio.Games.Scripts_ForkLifter float normalizedBeatAnim = Conductor.instance.GetPositionFromBeat(startBeat, 2.45f); anim.Play("Flicked_Object", -1, normalizedBeatAnim); anim.speed = 0; + } - float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 2f); - - StateCheck(normalizedBeat); - - if (PlayerInput.Pressed() && ForkLifterPlayer.instance.hitOnFrame == 0) + private void Just(PlayerActionEvent caller, float state) + { + if (state >= 1f) { - if (state.perfect) - { - Hit(); - } - else if (state.early) - { - Early(); - } - else if (state.late) - { - Late(); - } - - ForkLifterPlayer.instance.hitOnFrame++; + Late(); + } + else if (state <= -1f) + { + Early(); } - - if (normalizedBeat > Minigame.EndTime()) + else { - Jukebox.PlayOneShot("audience/disappointed"); - Destroy(this.gameObject); + Hit(); } } + + private void Miss(PlayerActionEvent caller) + { + Jukebox.PlayOneShot("audience/disappointed"); + BeatAction.New(game.gameObject, new List() + { + new BeatAction.Action(startBeat+ 2.45f, delegate { + Destroy(this.gameObject); + }), + }); + } + + private void Out(PlayerActionEvent caller) {} } } \ No newline at end of file diff --git a/Assets/Scripts/Games/Kitties.meta b/Assets/Scripts/Games/Kitties.meta new file mode 100644 index 000000000..3c9ae8eb5 --- /dev/null +++ b/Assets/Scripts/Games/Kitties.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: be767c52a05769c469b1f2e538a27441 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/Kitties/Kitties.cs b/Assets/Scripts/Games/Kitties/Kitties.cs new file mode 100644 index 000000000..741583b0d --- /dev/null +++ b/Assets/Scripts/Games/Kitties/Kitties.cs @@ -0,0 +1,71 @@ +using HeavenStudio.Util; +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace HeavenStudio.Games.Loaders +{ + using static Minigames; + public static class CtrTeppanLoader + { + public static Minigame AddGame(EventCaller eventCaller) + { + return new Minigame("kitties", "Kitties! \n[INITIALIZATION ONLY]", "0058CE", false, false, new List() + { + new GameAction("clap", "Cat Clap") + { + function = delegate { Kitties.instance.Clap(eventCaller.currentEntity["toggle"], eventCaller.currentEntity["toggle"], + eventCaller.currentEntity.beat, eventCaller.currentEntity["type"]); }, + + defaultLength = 3, + parameters = new List() + { + 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("toggle", false, "Invert Direction", "Inverts the direction they clap in"), + } + }, + + new GameAction("clapclose", "Up Close Clap") + { + function = delegate { Kitties.instance.ClapClose(eventCaller.currentEntity.beat); }, + + defaultLength = 3, + }, + + }); + } + } +} +namespace HeavenStudio.Games +{ + using Scripts_Fireworks; + public class Kitties : Minigame + { + public enum SpawnType + { + Straight, + DiagonalDown, + DiagonalUp, + } + + public static Kitties instance; + + void Awake() + { + instance = this; + } + + // Update is called once per frame + void Update() + { + + } + + public void Clap(bool isMice, bool isRightToLeft, float beat, int type = (int)SpawnType.Straight) + { } + + public void ClapClose(float beat) + { } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Games/Kitties/Kitties.cs.meta b/Assets/Scripts/Games/Kitties/Kitties.cs.meta new file mode 100644 index 000000000..29378e66f --- /dev/null +++ b/Assets/Scripts/Games/Kitties/Kitties.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88dcedc3c54551e4aa578b6fa2a4241a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs index 9842e3183..82d5a8a8a 100644 --- a/Assets/Scripts/Games/Minigame.cs +++ b/Assets/Scripts/Games/Minigame.cs @@ -113,6 +113,9 @@ namespace HeavenStudio.Games foreach(PlayerActionEvent toCompare in scheduledInputs) { + // ignore inputs that are for sequencing in autoplay + if (toCompare.autoplayOnly) continue; + if(closest == null) { if (input == InputType.ANY || toCompare.inputType.HasFlag(input)) diff --git a/Assets/Scripts/Util/BeatAction.cs b/Assets/Scripts/Util/BeatAction.cs index 60d81c8f2..a45b17982 100644 --- a/Assets/Scripts/Util/BeatAction.cs +++ b/Assets/Scripts/Util/BeatAction.cs @@ -13,25 +13,27 @@ namespace HeavenStudio.Util public class Action { - public float beat { get; set; } + public double beat { get; set; } public EventCallback function { get; set; } - public Action(float beat, EventCallback function) + public Action(double beat, EventCallback function) { this.beat = beat; this.function = function; } } - public static void New(GameObject prefab, List actions) + public static BeatAction New(GameObject prefab, List actions) { BeatAction beatAction = prefab.AddComponent(); beatAction.actions = actions; + + return beatAction; } private void Update() { - float songPositionInBeats = Conductor.instance.songPositionInBeats; + double songPositionInBeats = Conductor.instance.songPositionInBeatsAsDouble; for (int i = 0; i < actions.Count; i++) { @@ -42,6 +44,11 @@ namespace HeavenStudio.Util } } } + + public void Delete() + { + Destroy(this); + } } } \ No newline at end of file