diff --git a/Assets/Resources/Games/manzai.prefab b/Assets/Resources/Games/manzai.prefab index 6020f990a..302a738b5 100644 --- a/Assets/Resources/Games/manzai.prefab +++ b/Assets/Resources/Games/manzai.prefab @@ -294,6 +294,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7879640242725009620} + - component: {fileID: 4047821211562032729} m_Layer: 0 m_Name: Birds m_TagString: Untagged @@ -309,15 +310,36 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 533946701276818074} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.49, y: -0.21889482, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 1.22, y: -0.4, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5721729477846433201} - - {fileID: 1146595349693182952} + - {fileID: 1174820171874869876} + - {fileID: 4470941884995114579} m_Father: {fileID: 3661019275362709209} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4047821211562032729 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533946701276818074} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: cced12c2e75219c4bb84b6f5c71098b6, 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 &760730939766939462 GameObject: m_ObjectHideFlags: 0 @@ -378,7 +400,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 791308303991502948} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.77, y: -0.66110516, z: 0.05792329} + m_LocalPosition: {x: -3, y: -0.50000006, z: 0.05792329} m_LocalScale: {x: 2.2, y: 2.2, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -386,7 +408,7 @@ Transform: - {fileID: 785840404966787129} - {fileID: 2312516982777118322} - {fileID: 4417841991947308916} - m_Father: {fileID: 7879640242725009620} + m_Father: {fileID: 4470941884995114579} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7204459476474823181 @@ -1275,7 +1297,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2731808410480165808} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.3, y: 0.36889482, z: 0.018050596} + m_LocalPosition: {x: 1.2999998, y: 0.36889482, z: 0.018050596} m_LocalScale: {x: 2.2, y: 2.2, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1290,8 +1312,8 @@ Transform: - {fileID: 2214701733368068481} - {fileID: 3153783865440649635} - {fileID: 3637003924673505733} - m_Father: {fileID: 7879640242725009620} - m_RootOrder: 1 + m_Father: {fileID: 1174820171874869876} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6900698675499260864 Animator: @@ -1398,6 +1420,38 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2962695719839736121 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1174820171874869876} + m_Layer: 0 + m_Name: VultureHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1174820171874869876 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2962695719839736121} + 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: 1146595349693182952} + m_Father: {fileID: 7879640242725009620} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2996162329579325789 GameObject: m_ObjectHideFlags: 0 @@ -1452,6 +1506,7 @@ MonoBehaviour: RavenAnim: {fileID: 7204459476474823181} HaiBubbleL: {fileID: 8456601383015447979} HaiBubbleR: {fileID: 2672010817748250556} + BothBirdsAnim: {fileID: 0} --- !u!1 &3161037767898396668 GameObject: m_ObjectHideFlags: 0 @@ -2923,6 +2978,38 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5635069735558573478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4470941884995114579} + m_Layer: 0 + m_Name: RavenHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4470941884995114579 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5635069735558573478} + 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: 5721729477846433201} + m_Father: {fileID: 7879640242725009620} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5759438941247041264 GameObject: m_ObjectHideFlags: 0 @@ -3569,8 +3656,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6491076149254200282} 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_LocalPosition: {x: 0.1, y: 0, z: -1} + m_LocalScale: {x: 0.9, y: 0.9, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1145748648927483639} diff --git a/Assets/Resources/Sfx/games/manzai/disappointed.ogg b/Assets/Resources/Sfx/games/manzai/disappointed.ogg new file mode 100644 index 000000000..ff363764e Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/disappointed.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/disappointed.ogg.meta b/Assets/Resources/Sfx/games/manzai/disappointed.ogg.meta new file mode 100644 index 000000000..556f35492 --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/disappointed.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9867f4959b7c73742aa9befbe0a69748 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/manzai/donaiyanenLaugh.ogg b/Assets/Resources/Sfx/games/manzai/donaiyanenLaugh.ogg new file mode 100644 index 000000000..77e5a061c Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/donaiyanenLaugh.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/donaiyanenLaugh.ogg.meta b/Assets/Resources/Sfx/games/manzai/donaiyanenLaugh.ogg.meta new file mode 100644 index 000000000..5dde5a2c1 --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/donaiyanenLaugh.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8efeadf00f421b449892fd0888514a83 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/manzai/haiClap.ogg b/Assets/Resources/Sfx/games/manzai/haiClap.ogg new file mode 100644 index 000000000..371b602a7 Binary files /dev/null and b/Assets/Resources/Sfx/games/manzai/haiClap.ogg differ diff --git a/Assets/Resources/Sfx/games/manzai/haiClap.ogg.meta b/Assets/Resources/Sfx/games/manzai/haiClap.ogg.meta new file mode 100644 index 000000000..107a2a696 --- /dev/null +++ b/Assets/Resources/Sfx/games/manzai/haiClap.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4c85c681e4c67454db1bae1f531f8c20 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds.meta new file mode 100644 index 000000000..674574dcc --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 664f3c8d2e6aed24186ff71af2f6ca77 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideIn.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideIn.anim new file mode 100644 index 000000000..9a64cd340 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideIn.anim @@ -0,0 +1,285 @@ +%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: BirdsSlideIn + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3.8, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -11.4, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + 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: VultureHolder + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -3.8, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 11.4, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + 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: RavenHolder + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1385678538 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3582809431 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + 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: 3.8 + inSlope: 0 + outSlope: -11.4 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: VultureHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: VultureHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: VultureHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.8 + inSlope: 0 + outSlope: 11.4 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: RavenHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: RavenHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: RavenHolder + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideIn.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideIn.anim.meta new file mode 100644 index 000000000..56f7a050e --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideIn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 61ba768275705a449b20d587af052b35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideOut.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideOut.anim new file mode 100644 index 000000000..dc8377cb9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideOut.anim @@ -0,0 +1,285 @@ +%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: BirdsSlideOut + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 11.4, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 3.8, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -12, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + 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: VultureHolder + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: -11.4, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: -3.8, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 12, y: 0, z: 0} + tangentMode: 0 + weightedMode: 1 + 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: RavenHolder + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1385678538 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3582809431 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.33333334 + 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 + inSlope: 0 + outSlope: 11.4 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 3.8 + inSlope: 0 + outSlope: -12 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: VultureHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: VultureHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: VultureHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: -11.4 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: -3.8 + inSlope: 0 + outSlope: 12 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: RavenHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: RavenHolder + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 65 + weightedMode: 1 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: RavenHolder + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideOut.anim.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideOut.anim.meta new file mode 100644 index 000000000..1e0a3e191 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BirdsSlideOut.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42a35ac973e1a6248bee268ece75e4ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BothBirdsAnim.controller b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BothBirdsAnim.controller new file mode 100644 index 000000000..f270bdb4a --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BothBirdsAnim.controller @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6558146933137810680 +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: 3923422076526863495} + m_Position: {x: 0, y: 200, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5437197527440813952} + m_Position: {x: 300, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4423860954914537096} + m_Position: {x: 300, y: 100, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 0, y: 0, z: 0} + m_EntryPosition: {x: 0, y: 100, z: 0} + m_ExitPosition: {x: 300, y: 200, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3923422076526863495} +--- !u!1102 &-4423860954914537096 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SlideOut + 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: 42a35ac973e1a6248bee268ece75e4ca, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BothBirdsAnim + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6558146933137810680} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &3923422076526863495 +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 &5437197527440813952 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SlideIn + 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: 61ba768275705a449b20d587af052b35, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BothBirdsAnim.controller.meta b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BothBirdsAnim.controller.meta new file mode 100644 index 000000000..ebb3e5cb2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/BothBirds/BothBirdsAnim.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cced12c2e75219c4bb84b6f5c71098b6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + 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 index d07baeccc..ea19bb23f 100644 --- a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearL.anim @@ -29,7 +29,7 @@ AnimationClip: 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 + time: 0.05 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} @@ -38,7 +38,7 @@ AnimationClip: 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 + time: 0.06666667 value: {x: 1.5, y: 1.5, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -47,7 +47,7 @@ AnimationClip: 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 + time: 0.1 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -73,7 +73,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -101,7 +101,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -151,7 +151,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5 + m_StopTime: 0.43333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -180,7 +180,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.05 value: 0.8 inSlope: 25.999998 outSlope: 25.999998 @@ -189,7 +189,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 1.5 inSlope: 0 outSlope: Infinity @@ -198,7 +198,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1 inSlope: 0 outSlope: 0 @@ -226,7 +226,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.05 value: 0.8 inSlope: 25.999998 outSlope: 25.999998 @@ -235,7 +235,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 1.5 inSlope: 0 outSlope: Infinity @@ -244,7 +244,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1 inSlope: 0 outSlope: 0 @@ -272,7 +272,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.05 value: 1 inSlope: 0 outSlope: 0 @@ -281,7 +281,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 1 inSlope: 0 outSlope: Infinity @@ -290,7 +290,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1 inSlope: 0 outSlope: 0 @@ -318,7 +318,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -346,7 +346,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim index ee6be797d..aca7a0cf9 100644 --- a/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Bubble/HaiAppearR.anim @@ -29,16 +29,16 @@ AnimationClip: 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 + time: 0.05 value: {x: 1.2, y: 1.2, z: 1} - inSlope: {x: 39, y: 39, z: 0} - outSlope: {x: 39, y: 39, z: 0} + inSlope: {x: 29.25, y: 29.25, z: 0} + outSlope: {x: 29.25, y: 29.25, 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 + time: 0.06666667 value: {x: 2.25, y: 2.25, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: Infinity, y: Infinity, z: Infinity} @@ -47,7 +47,7 @@ AnimationClip: 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 + time: 0.1 value: {x: 1.5, y: 1.5, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -73,7 +73,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -101,7 +101,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -151,7 +151,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5 + m_StopTime: 0.43333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -180,16 +180,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.05 value: 1.2 - inSlope: 39 - outSlope: 39 + inSlope: 29.25 + outSlope: 29.25 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 2.25 inSlope: 0 outSlope: Infinity @@ -198,7 +198,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1.5 inSlope: 0 outSlope: 0 @@ -226,16 +226,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.05 value: 1.2 - inSlope: 39 - outSlope: 39 + inSlope: 29.25 + outSlope: 29.25 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 2.25 inSlope: 0 outSlope: Infinity @@ -244,7 +244,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1.5 inSlope: 0 outSlope: 0 @@ -272,7 +272,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 + time: 0.05 value: 1 inSlope: 0 outSlope: 0 @@ -281,7 +281,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.06666667 value: 1 inSlope: 0 outSlope: Infinity @@ -290,7 +290,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.1 value: 1 inSlope: 0 outSlope: 0 @@ -318,7 +318,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -346,7 +346,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 + time: 0.43333334 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller index 3e6095584..55ee695c6 100644 --- a/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Raven/RavenAnim.controller @@ -201,7 +201,7 @@ AnimatorStateMachine: m_Position: {x: 400, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -4531825814840688901} - m_Position: {x: 400, y: 300, z: 0} + m_Position: {x: 400, y: 350, z: 0} - serializedVersion: 1 m_State: {fileID: -9038879307389905707} m_Position: {x: 700, y: 50, z: 0} diff --git a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller index a0f5e574b..e2fe3e1f6 100644 --- a/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller +++ b/Assets/Resources/Sprites/Games/Manzai/Animations/Vulture/VultureAnim.controller @@ -175,7 +175,7 @@ AnimatorStateMachine: m_Position: {x: 400, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: 1991386350695458482} - m_Position: {x: 400, y: 300, z: 0} + m_Position: {x: 400, y: 350, z: 0} - serializedVersion: 1 m_State: {fileID: -1699792846544817994} m_Position: {x: 700, y: 60, z: 0} diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 0cf9652fa..1f034c56e 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -551,9 +551,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &9435782 @@ -4172,9 +4172,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 32, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &121871281 @@ -4396,9 +4396,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 72, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &129013734 @@ -4532,9 +4532,9 @@ RectTransform: m_Father: {fileID: 539838476} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 112, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 1, y: 0.5} --- !u!114 &151246938 @@ -26850,8 +26850,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 - m_Size: 1 + m_Value: 1 + m_Size: 0.9751009 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -32707,7 +32707,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 91.71427} + m_AnchoredPosition: {x: 0, y: 91.71366} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -37250,9 +37250,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1345846031 @@ -46875,9 +46875,9 @@ RectTransform: m_Father: {fileID: 574002313} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -21} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 32, y: 32} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1783491359 diff --git a/Assets/Scripts/Games/Manzai/Manzai.cs b/Assets/Scripts/Games/Manzai/Manzai.cs index 05afeaf7e..e15304216 100644 --- a/Assets/Scripts/Games/Manzai/Manzai.cs +++ b/Assets/Scripts/Games/Manzai/Manzai.cs @@ -53,6 +53,16 @@ namespace HeavenStudio.Games.Loaders function = delegate { Manzai.instance.CustomBoing(eventCaller.currentEntity.beat); }, defaultLength = 0.5f, }, + new GameAction("slidein", "Slide In") + { + function = delegate { Manzai.instance.BirdsSlideIn(eventCaller.currentEntity.beat); }, + defaultLength = 0.5f, + }, + new GameAction("slideout", "Slide Out") + { + function = delegate { Manzai.instance.BirdsSlideOut(eventCaller.currentEntity.beat); }, + defaultLength = 0.5f, + }, }); } } @@ -85,6 +95,7 @@ namespace HeavenStudio.Games [SerializeField] Animator RavenAnim; [SerializeField] Animator HaiBubbleL; [SerializeField] Animator HaiBubbleR; + [SerializeField] Animator BothBirdsAnim; bool ravenBop = true; bool vultureBop = true; @@ -241,7 +252,7 @@ namespace HeavenStudio.Games public void HaiMiss(PlayerActionEvent caller) { - //SoundByte.PlayOneShotGame("manzai/audienceSad"); + SoundByte.PlayOneShotGame("manzai/disappointed"); //SoundByte.PlayOneShotGame("manzai/hai"); //RavenAnim.DoScaledAnimationAsync("Talk", 0.5f); @@ -279,7 +290,7 @@ namespace HeavenStudio.Games public void BoingMiss(PlayerActionEvent caller) { - + SoundByte.PlayOneShotGame("manzai/disappointed"); } public void CustomBoing(double beat) @@ -290,7 +301,17 @@ namespace HeavenStudio.Games public void Nothing(PlayerActionEvent caller) { - + + } + + public void BirdsSlideIn(double beat) + { + BothBirdsAnim.DoScaledAnimationAsync("SlideIn", 0.5f); + } + + public void BirdsSlideOut(double beat) + { + BothBirdsAnim.DoScaledAnimationAsync("SlideOut", 0.5f); } } }