From e3899a5f7a780b69e13f24c56c59ac74f0b9a8b9 Mon Sep 17 00:00:00 2001 From: ThePurpleAnon <100617766+ThePurpleAnon@users.noreply.github.com> Date: Sun, 31 Dec 2023 04:00:02 -0600 Subject: [PATCH] Added "Hai" Bubbles basic functionality and animation for "hai" speech bubbles, bubbles are able appear in a random order --- Assets/Resources/Games/manzai.prefab | 510 +++++++++++++++++- .../Prefabs/GameView/GameTex.renderTexture | 4 +- .../Prefabs/GameView/OverlayTex.renderTexture | 4 +- .../Games/Manzai/Animations/Bubble.meta | 8 + .../Manzai/Animations/Bubble/HaiAppearL.anim | 367 +++++++++++++ .../Animations/Bubble/HaiAppearL.anim.meta | 8 + .../Manzai/Animations/Bubble/HaiAppearR.anim | 367 +++++++++++++ .../Animations/Bubble/HaiAppearR.anim.meta | 8 + .../Animations/Bubble/HaiBubbleL.controller | 101 ++++ .../Bubble/HaiBubbleL.controller.meta | 8 + .../Animations/Bubble/HaiBubbleR.controller | 101 ++++ .../Bubble/HaiBubbleR.controller.meta | 8 + .../Sprites/Games/Manzai/Bubbles.png | Bin 0 -> 11791 bytes .../Sprites/Games/Manzai/Bubbles.png.meta | 226 ++++++++ Assets/Scenes/Editor.unity | 6 +- Assets/Scripts/Games/Manzai/Manzai.cs | 31 +- 16 files changed, 1730 insertions(+), 27 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble.meta create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim.meta create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim.meta create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller.meta create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller create mode 100644 Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller.meta create mode 100644 Assets/Resources/Sprites/Games/Manzai/Bubbles.png create mode 100644 Assets/Resources/Sprites/Games/Manzai/Bubbles.png.meta diff --git a/Assets/Resources/Games/manzai.prefab b/Assets/Resources/Games/manzai.prefab index e0f6c778e..547cf7a5e 100644 --- a/Assets/Resources/Games/manzai.prefab +++ b/Assets/Resources/Games/manzai.prefab @@ -1069,7 +1069,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1237,7 +1237,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1427,6 +1427,7 @@ Transform: - {fileID: 609423043376221866} - {fileID: 5850002581442868008} - {fileID: 7879640242725009620} + - {fileID: 5881063490390799054} - {fileID: 559909229433811898} - {fileID: 3320532349617826867} m_Father: {fileID: 0} @@ -1448,6 +1449,8 @@ MonoBehaviour: scheduledInputs: [] VultureAnim: {fileID: 6900698675499260864} RavenAnim: {fileID: 7204459476474823181} + HaiBubbleL: {fileID: 8456601383015447979} + HaiBubbleR: {fileID: 2672010817748250556} --- !u!1 &3161037767898396668 GameObject: m_ObjectHideFlags: 0 @@ -1520,7 +1523,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1807,7 +1810,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1819,6 +1822,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &3634253224683910091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1451881446329256267} + - component: {fileID: 7059776513506127562} + m_Layer: 0 + m_Name: TextL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1451881446329256267 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3634253224683910091} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.009999996, y: 0.15000004, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1575284730248154578} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7059776513506127562 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3634253224683910091} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 31 + m_Sprite: {fileID: 2043664094, guid: 9adae677572b99243bd7a7edac1b7d5e, 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.1, y: 0.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3640167334921957433 GameObject: m_ObjectHideFlags: 0 @@ -1891,7 +1978,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2223,7 +2310,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3661019275362709209} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &8912101035331227818 SpriteRenderer: @@ -2349,7 +2436,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -2445,6 +2532,60 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &4610263651717955089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2929667954241189041} + - component: {fileID: 8456601383015447979} + m_Layer: 0 + m_Name: SpeechL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2929667954241189041 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4610263651717955089} + m_LocalRotation: {x: -0, y: -0, z: 0.2588191, w: 0.9659258} + m_LocalPosition: {x: -3.39, y: 2.67, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1575284730248154578} + m_Father: {fileID: 5881063490390799054} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &8456601383015447979 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4610263651717955089} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4a72eeaac74fc2641b5d0709db569de5, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &4677702083910499792 GameObject: m_ObjectHideFlags: 0 @@ -2559,7 +2700,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3661019275362709209} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &614758050345320064 SpriteRenderer: @@ -2781,6 +2922,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5759438941247041264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1625629972816454084} + - component: {fileID: 5450820039184201496} + m_Layer: 0 + m_Name: TextR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1625629972816454084 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759438941247041264} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.010000016, y: 0.15, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2697637075176453146} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5450820039184201496 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759438941247041264} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 31 + m_Sprite: {fileID: 2043664094, guid: 9adae677572b99243bd7a7edac1b7d5e, 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.1, y: 0.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5991330016580328756 GameObject: m_ObjectHideFlags: 0 @@ -2949,6 +3174,91 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6183222101965389110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2697637075176453146} + - component: {fileID: 2490007507115525576} + m_Layer: 0 + m_Name: Bubble R + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2697637075176453146 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6183222101965389110} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1625629972816454084} + m_Father: {fileID: 433795689448701314} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -40} +--- !u!212 &2490007507115525576 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6183222101965389110} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30 + m_Sprite: {fileID: -1169759382, guid: 9adae677572b99243bd7a7edac1b7d5e, 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.89, y: 2.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6223936529390954875 GameObject: m_ObjectHideFlags: 0 @@ -3174,8 +3484,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6491076149254200282} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.15, y: 0, z: -1.5} - m_LocalScale: {x: 0.85, y: 0.85, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1145748648927483639} @@ -3308,6 +3618,91 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6742581147423258800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1575284730248154578} + - component: {fileID: 6988233135018391701} + m_Layer: 0 + m_Name: BubbleL + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1575284730248154578 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6742581147423258800} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1451881446329256267} + m_Father: {fileID: 2929667954241189041} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 30} +--- !u!212 &6988233135018391701 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6742581147423258800} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 30 + m_Sprite: {fileID: -1169759382, guid: 9adae677572b99243bd7a7edac1b7d5e, 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.89, y: 2.16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6853087582610682151 GameObject: m_ObjectHideFlags: 0 @@ -3380,7 +3775,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3464,7 +3859,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3632,7 +4027,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3716,7 +4111,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 20 m_Sprite: {fileID: 281178723, guid: ed1afb8f0be706748b977f2d6173c44c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3932,6 +4327,39 @@ Transform: m_Father: {fileID: 3661019275362709209} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8452936147525436988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5881063490390799054} + m_Layer: 0 + m_Name: Bubbles + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5881063490390799054 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8452936147525436988} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2929667954241189041} + - {fileID: 433795689448701314} + m_Father: {fileID: 3661019275362709209} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8627201407586870289 GameObject: m_ObjectHideFlags: 0 @@ -4016,6 +4444,60 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8974510991397761272 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 433795689448701314} + - component: {fileID: 2672010817748250556} + m_Layer: 0 + m_Name: SpeechR + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &433795689448701314 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974510991397761272} + m_LocalRotation: {x: -0, y: -0, z: -0.3420201, w: 0.9396927} + m_LocalPosition: {x: 1.16, y: 2.61, z: 0} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2697637075176453146} + m_Father: {fileID: 5881063490390799054} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2672010817748250556 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974510991397761272} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: f2060d12f79fbd84f93a4310910aff9b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8982233006656975795 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture index f9b689ef8..ba72e2bdb 100644 --- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 963 - m_Height: 542 + m_Width: 984 + m_Height: 554 m_AntiAliasing: 2 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture index 2c8f23bff..dc4f62e17 100644 --- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1444 - m_Height: 813 + m_Width: 1476 + m_Height: 831 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble.meta new file mode 100644 index 000000000..a9b0ad400 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0225fc0035d06a441bf9e9340569d455 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim new file mode 100644 index 000000000..d07baeccc --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim @@ -0,0 +1,367 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HaiAppearL + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.2, y: 0.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.033333335 + value: {x: 0.8, y: 0.8, z: 1} + inSlope: {x: 25.999998, y: 25.999998, z: 0} + outSlope: {x: 25.999998, y: 25.999998, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.05 + value: {x: 1.5, y: 1.5, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: BubbleL + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: BubbleL + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: BubbleL/TextL + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1105698020 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1105698020 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1264319784 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.8 + inSlope: 25.999998 + outSlope: 25.999998 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 1.5 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: BubbleL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.8 + inSlope: 25.999998 + outSlope: 25.999998 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 1.5 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: BubbleL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: BubbleL + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: BubbleL + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: BubbleL/TextL + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim.meta new file mode 100644 index 000000000..d7333f26a --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 055491f80186eca49ad0d02eb8af80f3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim new file mode 100644 index 000000000..ee6be797d --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim @@ -0,0 +1,367 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HaiAppearR + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.3, y: 0.3, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.033333335 + value: {x: 1.2, y: 1.2, z: 1} + inSlope: {x: 39, y: 39, z: 0} + outSlope: {x: 39, y: 39, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.05 + value: {x: 2.25, y: 2.25, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.083333336 + value: {x: 1.5, y: 1.5, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Bubble R + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Bubble R/TextR + classID: 212 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 956905987 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 691048100 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1.2 + inSlope: 39 + outSlope: 39 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 2.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1.2 + inSlope: 39 + outSlope: 39 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 2.25 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 1.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 1 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Bubble R + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Bubble R/TextR + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim.meta new file mode 100644 index 000000000..69f3a5181 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bad733be8405d34fa6b835653dadbc5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller new file mode 100644 index 000000000..c4fad7f78 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HaiBubbleL + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 3765276625886405161} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &3765276625886405161 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6155855339096320689} + m_Position: {x: 212.0589, y: 189.11761, z: 0} + - serializedVersion: 1 + m_State: {fileID: 9217735114383275971} + m_Position: {x: 427.20593, y: 96.91174, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6155855339096320689} +--- !u!1102 &6155855339096320689 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &9217735114383275971 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HaiL + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 055491f80186eca49ad0d02eb8af80f3, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller.meta new file mode 100644 index 000000000..3f2f3731c --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleL.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4a72eeaac74fc2641b5d0709db569de5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller new file mode 100644 index 000000000..893748ff8 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HaiBubbleR + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 3765276625886405161} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &3765276625886405161 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 6155855339096320689} + m_Position: {x: 212.0589, y: 189.11761, z: 0} + - serializedVersion: 1 + m_State: {fileID: 9217735114383275971} + m_Position: {x: 427.20593, y: 96.91174, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 6155855339096320689} +--- !u!1102 &6155855339096320689 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &9217735114383275971 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HaiR + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 5bad733be8405d34fa6b835653dadbc5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller.meta new file mode 100644 index 000000000..956d414c5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiBubbleR.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2060d12f79fbd84f93a4310910aff9b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Bubbles.png b/Assets/Resources/Sprites/Games/Manzai/Bubbles.png new file mode 100644 index 0000000000000000000000000000000000000000..50e6193e6a2c2623c8fd6b68363bb8a535bee290 GIT binary patch literal 11791 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 { new BeatAction.Action(beat + 0.0f, delegate { VultureAnim.DoScaledAnimationAsync("Talk", 0.5f); }), @@ -188,7 +192,7 @@ namespace HeavenStudio.Games }); } - public void HaiJust(PlayerActionEvent caller, float state) + public void HaiJustFull() { SoundByte.PlayOneShotGame("manzai/hai", pitch: Conductor.instance.songBpm/98); SoundByte.PlayOneShotGame("manzai/haiAccent"); @@ -196,11 +200,26 @@ namespace HeavenStudio.Games VultureAnim.DoScaledAnimationAsync("Bop", 0.5f); } + public void HaiJustL(PlayerActionEvent caller, float state) + { + HaiBubbleL.DoScaledAnimationAsync("HaiL", 0.5f); + HaiJustFull(); + } + + public void HaiJustR(PlayerActionEvent caller, float state) + { + HaiBubbleR.DoScaledAnimationAsync("HaiR", 0.5f); + HaiJustFull(); + } + + public void HaiMiss(PlayerActionEvent caller) { - SoundByte.PlayOneShotGame("manzai/hai"); - RavenAnim.DoScaledAnimationAsync("Talk", 0.5f); - VultureAnim.DoScaledAnimationAsync("Bop", 0.5f); + //SoundByte.PlayOneShotGame("manzai/audienceSad"); + + //SoundByte.PlayOneShotGame("manzai/hai"); + //RavenAnim.DoScaledAnimationAsync("Talk", 0.5f); + //VultureAnim.DoScaledAnimationAsync("Bop", 0.5f); } public void Nothing(PlayerActionEvent caller)