最新制作考核模式提交

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

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

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;
             }
         }

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;
+                        });
+                    }
                 });
             }
         }

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<Button>("尿道口按钮");
+                    niaoDaoKou_Btn.onClick.RemoveAllListeners();
+                    zuoGu_Btn = GameManager.Instance.transform.FindFirst<Button>("坐骨结节按钮");
+                    zuoGu_Btn.onClick.RemoveAllListeners();
+                    fsm.ShowCamera("测量方法1_Camera");
+                    fsm.ShowTip(0);
+                    fsm.PlayBgm(0);
+                    fsm.PlayClip("测量方法1_TimeLine", () =>
+                    {
+                        fsm.ShowTip(1);
+                        fsm.PlayBgm(1);
+                        niaoDaoKou_Btn.gameObject.SetActive(true);
+                        niaoDaoKou_Btn.onClick.AddListener(() =>
+                        {
+                            if (fsm.main_gameModel.modeType == ModeType.ShiXun)
+                            {
+                                fsm.AddScore(5, 1);
+                            }
+                            if (fsm.main_gameModel.modeType == ModeType.KaoHe)
+                            {
+                                fsm.AddScore(3, 1);
+                            }
+                            fsm.ShowCamera("测量方法2_Camera");
+                            niaoDaoKou_Btn.gameObject.SetActive(false);
+                            fsm.ShowTip(2);
+                            fsm.PlayBgm(2);
+                            cor = Game.Instance.IEnumeratorManager.Run(2.0f, () =>
+                            {
+                                zuoGu_Btn.gameObject.SetActive(true);
+                                zuoGu_Btn.onClick.AddListener(() =>
+                                {
+                                    if (fsm.main_gameModel.modeType == ModeType.ShiXun)
+                                    {
+                                        fsm.AddScore(5, 2);
+                                    }
+                                    if (fsm.main_gameModel.modeType == ModeType.KaoHe)
+                                    {
+                                        fsm.AddScore(3, 2);
+                                    }
+                                    zuoGu_Btn.gameObject.SetActive(false);
+                                    fsm.PlayClip("测量方法2_TimeLine", () =>
+                                    {
+                                        fsm.nextState = true;
+                                    });
+                                });
+                            });
+                        });
+                    });
+                });
+            }
+            if (fsm.main_gameModel.modeType == ModeType.ShiXun)
             {
                 niaoDaoKou_Btn = GameManager.Instance.transform.FindFirst<Button>("尿道口按钮");
                 niaoDaoKou_Btn.onClick.RemoveAllListeners();
@@ -64,7 +118,7 @@ namespace DongWuYiXue.DaoNiaoShu
                         });
                     });
                 });
-            });
+            }
         }
         public override void OnStateStay()
         {

Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/ChaGuanState.cs

@@ -59,10 +59,17 @@ namespace DongWuYiXue.DaoNiaoShu
                 fsm.ShowCamera("²å¹Ü2_Camera");
                 fsm.PlayClip("²å¹ÜºóÅÅÄò_TimeLine", () =>
                 {
-                    fsm.ShowTxtQuestion(3, 3, 5, () =>
+                    if (fsm.main_gameModel.modeType == ModeType.ShiXun)
                     {
                         fsm.nextState = true;
-                    });
+                    }
+                    if (fsm.main_gameModel.modeType == ModeType.KaoHe)
+                    {
+                        fsm.ShowTxtQuestion(3, 3, 5, () =>
+                        {
+                            fsm.nextState = true;
+                        });
+                    }
                 });
             }
         }