diff --git a/Assets/_Scenes/daoNiaoShu.unity b/Assets/_Scenes/daoNiaoShu.unity index 93cea19..e47db70 100644 --- a/Assets/_Scenes/daoNiaoShu.unity +++ b/Assets/_Scenes/daoNiaoShu.unity @@ -1355,6 +1355,77 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30dc6dd5a04da2b4b8e990e0a2bc246c, type: 3} +--- !u!1 &330857098 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 330857099} + - component: {fileID: 330857100} + m_Layer: 0 + m_Name: "\u6D4B\u91CF\u65B9\u6CD51_Camera" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &330857099 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330857098} + m_LocalRotation: {x: -0.41617897, y: 0.5730198, z: -0.4204085, w: -0.5671862} + m_LocalPosition: {x: 0.61163974, y: 1.5732231, z: 2.075686} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 655847503} + m_Father: {fileID: 8343209867940129229} + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &330857100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330857098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 60 + OrthographicSize: 5 + NearClipPlane: 0.001 + FarClipPlane: 5000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 655847503} --- !u!1001 &331169433 PrefabInstance: m_ObjectHideFlags: 0 @@ -3034,6 +3105,101 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 655653609} m_PrefabAsset: {fileID: 0} +--- !u!1 &655847502 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 655847503} + - component: {fileID: 655847506} + - component: {fileID: 655847505} + - component: {fileID: 655847504} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &655847503 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655847502} + m_LocalRotation: {x: 0.41617897, y: -0.5730198, z: 0.4204085, w: -0.5671862} + m_LocalPosition: {x: -2.0692549, y: 0.13142729, z: 1.6907156} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 330857099} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &655847504 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655847502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 0, y: 0, z: -10} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 +--- !u!114 &655847505 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655847502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &655847506 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 655847502} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &661480597 GameObject: m_ObjectHideFlags: 3 @@ -121245,6 +121411,7 @@ Transform: - {fileID: 1189879258} - {fileID: 1985186735} - {fileID: 532784560} + - {fileID: 330857099} m_Father: {fileID: 8343209867889649114} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs index bd39601..0777d43 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/CeLiangFangFaState.cs @@ -7,6 +7,9 @@ namespace DongWuYiXue.DaoNiaoShu { base.OnStateEnter(); this.Log("进入测量方法状态"); + fsm.ShowCamera("测量方法1_Camera"); + fsm.ShowTip(0); + fsm.PlayBgm(0); } public override void OnStateStay() { diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChongXiBaoPiQiangState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChongXiBaoPiQiangState.cs index a5e8c7b..286bef9 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChongXiBaoPiQiangState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChongXiBaoPiQiangState.cs @@ -1,6 +1,7 @@ using FSM; using Unity.VisualScripting; using UnityEngine; +using ZXKFramework; namespace DongWuYiXue.DaoNiaoShu { public class ChongXiBaoPiQiangState : FsmState @@ -24,6 +25,10 @@ namespace DongWuYiXue.DaoNiaoShu fsm.ShowArrow("点击注射器", "20ml注射器"); fsm.InteractionDown("20ml注射器", c => { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(4, 0); + } fsm.HideArrow(); fsm.Unlight_DisableInteraction("20ml注射器"); fsm.Hide("20ml注射器"); @@ -53,6 +58,10 @@ namespace DongWuYiXue.DaoNiaoShu } if (tuiValue >= 1.0f) { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(4, 0); + } isTui = false; fsm.nextState = true; } diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs index 358deff..5ffbf33 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs @@ -18,6 +18,10 @@ namespace DongWuYiXue.DaoNiaoShu fsm.PlayBgm(0); fsm.InteractionDown("氯己定棉球", c => { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(4, 0); + } fsm.HideArrow(); fsm.ShowCamera("清洁包皮口2_Camera"); fsm.Unlight_DisableInteraction("氯己定棉球"); @@ -26,6 +30,10 @@ namespace DongWuYiXue.DaoNiaoShu fsm.Show("手拿镊子消毒"); cor = Game.Instance.IEnumeratorManager.Run(3.0f, () => { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(5, 1); + } fsm.nextState = true; }); }); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs index 3342d7a..afd82a1 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs @@ -17,6 +17,10 @@ namespace DongWuYiXue.DaoNiaoShu fsm.PlayBgm(0); fsm.InteractionDown("氯己定棉球", c => { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(4, 0); + } fsm.HideArrow(); fsm.ShowCamera("清洁尿道口2_Camera"); fsm.Unlight_DisableInteraction("氯己定棉球"); @@ -25,6 +29,10 @@ namespace DongWuYiXue.DaoNiaoShu fsm.Show("手拿镊子消毒"); cor = Game.Instance.IEnumeratorManager.Run(3.0f, () => { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(5, 1); + } fsm.nextState = true; }); }); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QuChuDaoNiaoGuanState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QuChuDaoNiaoGuanState.cs index ac5a7db..8d122f7 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QuChuDaoNiaoGuanState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QuChuDaoNiaoGuanState.cs @@ -1,4 +1,5 @@ using FSM; +using ZXKFramework; namespace DongWuYiXue.DaoNiaoShu { public class QuChuDaoNiaoGuanState : FsmState @@ -14,6 +15,10 @@ namespace DongWuYiXue.DaoNiaoShu fsm.ShowArrow("点击导尿管", "导尿管"); fsm.InteractionDown("导尿管", c => { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(3, 0); + } fsm.HideArrow(); fsm.Unlight_DisableInteraction("导尿管"); fsm.Hide("打开导尿管后"); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/TuMoLiDuoKaYinState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/TuMoLiDuoKaYinState.cs index b38aa05..9fc6f6c 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/TuMoLiDuoKaYinState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/TuMoLiDuoKaYinState.cs @@ -1,4 +1,5 @@ using FSM; +using ZXKFramework; namespace DongWuYiXue.DaoNiaoShu { public class TuMoLiDuoKaYinState : FsmState @@ -13,6 +14,10 @@ namespace DongWuYiXue.DaoNiaoShu fsm.Light_EnableInteraction("利多卡因凝胶"); fsm.InteractionDown("利多卡因凝胶", c => { + if (fsm.main_gameModel.modeType == ModeType.ShiXun) + { + fsm.AddScore(3, 0); + } fsm.Unlight_DisableInteraction("利多卡因凝胶"); fsm.ShowCamera("涂抹利多卡因2_Camera"); fsm.PlayClip("涂抹利多卡因_TimeLine", () =>