From f6476412ff0d99067924bd967bbb8d4e6b0fe427 Mon Sep 17 00:00:00 2001 From: ddg <1453062510@qq.com> Date: Mon, 15 Sep 2025 19:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=88=B6=E4=BD=9C=E8=80=83?= =?UTF-8?q?=E6=A0=B8=E6=A8=A1=E5=BC=8F=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Art/Timeline/插管后排尿_TimeLine.playable | 156 ++++++++++++++++++ .../daoNiaoShu/ExcelData/Excel/BaseData.xlsx | Bin 13986 -> 13994 bytes Assets/_Scenes/daoNiaoShu.unity | 22 +++ .../FSMManager/State/BaChuDaoNiaoGuanState.cs | 4 + .../FSMManager/State/BingLiState.cs | 11 +- .../FSMManager/State/CeLiangFangFaState.cs | 58 ++++++- .../FSMManager/State/ChaGuanState.cs | 11 +- 7 files changed, 256 insertions(+), 6 deletions(-) diff --git a/Assets/Art/Timeline/插管后排尿_TimeLine.playable b/Assets/Art/Timeline/插管后排尿_TimeLine.playable index 6e2817a..9079550 100644 --- a/Assets/Art/Timeline/插管后排尿_TimeLine.playable +++ b/Assets/Art/Timeline/插管后排尿_TimeLine.playable @@ -421,6 +421,7 @@ MonoBehaviour: - {fileID: -1226156675397682883} - {fileID: 6367393684562853768} - {fileID: 1292456337520144976} + - {fileID: 3745576227737399518} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -468,6 +469,47 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!114 &3745576227737399518 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0} + m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 6672362712209339302} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 --- !u!114 &6367393684562853768 MonoBehaviour: m_ObjectHideFlags: 1 @@ -509,6 +551,120 @@ MonoBehaviour: m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} m_Rotation: {x: 0, y: 0, z: 0, w: 1} m_ApplyOffsets: 0 +--- !u!74 &6672362712209339302 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 2 + value: -0.005 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.983333 + value: 0.017 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Height + path: + classID: 23 + 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: 2345797562 + script: {fileID: 0} + typeID: 23 + customType: 22 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 5.983333 + 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: 2 + value: -0.005 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.983333 + value: 0.017 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Height + path: + classID: 23 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] --- !u!74 &8801329155241145929 AnimationClip: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx b/Assets/Resources/daoNiaoShu/ExcelData/Excel/BaseData.xlsx index b5e38a7a9af19bcb706011a214ace9caf8cb2a12..5eda61170ca3577f361534fe5c850c7ad7a9c0a8 100644 GIT binary patch delta 3301 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 delta 3314 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 diff --git a/Assets/_Scenes/daoNiaoShu.unity b/Assets/_Scenes/daoNiaoShu.unity index 377ddce..e68090d 100644 --- a/Assets/_Scenes/daoNiaoShu.unity +++ b/Assets/_Scenes/daoNiaoShu.unity @@ -122393,6 +122393,26 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: serializedGuid: c4ce67705c3e7245b5f739349c47e2c5 +--- !u!95 &1293822188 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2073133601} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &1293896977 MonoBehaviour: m_ObjectHideFlags: 0 @@ -161566,6 +161586,8 @@ PlayableDirector: value: {fileID: 1631532823} - key: {fileID: 1292456337520144976, guid: 3f70e6b3d3be3f2459035f2cfb6935b7, type: 2} value: {fileID: 1631532822} + - key: {fileID: 3745576227737399518, guid: 3f70e6b3d3be3f2459035f2cfb6935b7, type: 2} + value: {fileID: 1293822188} m_ExposedReferences: m_References: [] --- !u!114 &1778810726 diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaChuDaoNiaoGuanState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaChuDaoNiaoGuanState.cs index c3b764e..d6d6e83 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaChuDaoNiaoGuanState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BaChuDaoNiaoGuanState.cs @@ -50,6 +50,10 @@ namespace DongWuYiXue.DaoNiaoShu { fsm.AddScore(5, 0); } + if (fsm.main_gameModel.modeType == ModeType.KaoHe) + { + fsm.AddScore(3, 0); + } fsm.nextState = true; } } diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs index 6fba5a0..7544ed5 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/BingLiState.cs @@ -51,10 +51,17 @@ namespace DongWuYiXue.DaoNiaoShu { GameManager.Instance.transform.FindFirst("ʼ").gameObject.SetActive(false); fsm.ShowTip(0); - fsm.ShowTxtQuestion(1, 3, 1, () => + if (fsm.main_gameModel.modeType == ModeType.ShiXun) { fsm.nextState = true; - }); + } + if (fsm.main_gameModel.modeType == ModeType.KaoHe) + { + fsm.ShowTxtQuestion(1, 3, 1, () => + { + fsm.nextState = true; + }); + } }); } } diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs index 98bfd89..fdb5dfc 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs @@ -14,7 +14,61 @@ namespace DongWuYiXue.DaoNiaoShu { base.OnStateEnter(); this.Log("״̬"); - fsm.ShowTxtQuestion(2, 3, 0, () => + if (fsm.main_gameModel.modeType == ModeType.KaoHe) + { + fsm.ShowTxtQuestion(2, 3, 0, () => + { + niaoDaoKou_Btn = GameManager.Instance.transform.FindFirst