diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 470932bfb..6ea673913 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -1680,6 +1680,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &597781378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 597781380} + - component: {fileID: 597781379} + m_Layer: 0 + m_Name: Black Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &597781379 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597781378} + m_Enabled: 1 + 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: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: -1 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &597781380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597781378} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.6362123, y: 0.14456247, z: 0} + m_LocalScale: {x: 35, y: 15, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &604681209 GameObject: m_ObjectHideFlags: 0 @@ -10040,6 +10124,7 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: + - {fileID: 597781380} - {fileID: 7026926953013077400} - {fileID: 1272342139116525773} - {fileID: 154381820} diff --git a/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs index 8b4389a40..723fcfdc7 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/BodyModuleTransition.cs @@ -48,10 +48,6 @@ namespace AibisDream.FixSystem gearSystem.CurDataKey = _configKey; gearSystem.Load(); } - - // 打开引擎盖子 - yield return gearSystem.OpenCover(); - yield return gearSystem.OpenGearPanel(); } public void SetArgs(string arg) diff --git a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs index 394be52fc..1b248fb2a 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/ClinicTransition.cs @@ -135,14 +135,10 @@ namespace AibisDream.FixSystem var clinicSystem = FixSystemCenter.SystemDic.Get(); var gearSystem = FixSystemCenter.SystemDic.Get(); - // 黑屏 - // yield return MainUIController.Instance.FadeInSync(FadeDuration); // 隐藏诊所 clinicSystem.gameObject.SetActive(false); // 激活插线系统 bodyModuleSystem.gameObject.SetActive(true); - // 黑屏淡出 - // yield return MainUIController.Instance.FadeOutSync(FadeDuration); // 移动相机 yield return CameraKit.Instance.TransCameraAsync(CameraPos, OrthographicSize, Duration); // 开启引擎玩法 @@ -151,9 +147,6 @@ namespace AibisDream.FixSystem gearSystem.CurDataKey = _configName; gearSystem.Load(); } - - yield return gearSystem.OpenCover(); - yield return gearSystem.OpenGearPanel(); } public void SetArgs(string arg) diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 4284f9847..5e65dc113 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -66,6 +66,11 @@ namespace AibisDream.Framework { return TransCameraAsync(_initPos, _initOrthographicSize, duration); } + + public IEnumerator ShakeCamera(float duration, float strength, int vibrate) + { + yield return _mainCamera.transform.DOShakePosition(duration, strength, vibrate, 90, false, false).WaitForCompletion(); + } } public static class CameraCommand @@ -89,5 +94,11 @@ namespace AibisDream.Framework Vector3 targetPos = new Vector3(x, y, -10); return CameraKit.Instance.TransCameraAsync(targetPos, duration); } + + [YarnCommand("shake_camera")] + public static IEnumerator ShakeCamera(float duration, float strength, int vibrate = 10) + { + return CameraKit.Instance.ShakeCamera(duration, strength, vibrate); + } } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs b/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs index dace9c2c7..10bd1c2f0 100644 --- a/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs +++ b/Assets/Scripts/MiniGame/Gear/GearYarnCommand.cs @@ -26,5 +26,17 @@ namespace AibisDream { return FixSystemCenter.SystemDic.Get().CloseGearPanel(); } + + [YarnCommand("close_gear_cover")] + public static IEnumerator CloseCover() + { + return FixSystemCenter.SystemDic.Get().CloseCover(); + } + + [YarnCommand("open_gear_cover")] + public static IEnumerator OpenCover() + { + return FixSystemCenter.SystemDic.Get().OpenCover(); + } } } \ No newline at end of file