修改七步洗手法速度

修改考核模式其他问题
2025-01-16 15:12:38 +08:00 · 2025-01-16 15:12:38 +08:00 · d281c4b049
commit d281c4b049
parent 12ea46c6e2
6 changed files with 484 additions and 58 deletions
--- a/Assets/StreamingAssets/Excel/NiuData.xlsx
+++ b/Assets/StreamingAssets/Excel/NiuData.xlsx
--- a/Assets/StreamingAssets/ExcelJson/NiuData.txt
+++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt
@ -193,7 +193,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
@ -1181,7 +1181,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
@ -2325,7 +2325,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
@ -2845,7 +2845,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
@ -3781,7 +3781,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
@ -4509,7 +4509,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
@ -4951,7 +4951,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
@ -5757,7 +5757,7 @@
    "ProcessDescription": "对手部和手臂进行消毒",
    "SoundPath": "N006",
    "VideoPath": "",
-    "TimelineLength": 3475,
+    "TimelineLength": 1755,
    "CameraDefaultTR": "12.02988_-2.153493_39.15527|20.47498_59.70495_0",
    "CameraNearTR": "",
    "CameraNearTR2": "",
--- a/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable
+++ b/Assets/TimeLine/PeoplePlanTimeLineCtrl.playable
@ -34,7 +34,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 59.750000000000114
+    m_Start: 30.916666666666714
    m_ClipIn: 0
    m_Asset: {fileID: -887366813666480223}
    m_Duration: 4.333333333333215
@ -130,7 +130,7 @@ MonoBehaviour:
    m_Start: 0.05
    m_ClipIn: 0
    m_Asset: {fileID: -2795832693550970708}
-    m_Duration: 77.53333333333333
+    m_Duration: 48.7
    m_TimeScale: 1
    m_ParentTrack: {fileID: -7617158952748780786}
    m_EaseInDuration: 0
@ -242,7 +242,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 59.750000000000114
+    m_Start: 30.916666666666714
    m_ClipIn: 0
    m_Asset: {fileID: 2205132455560521697}
    m_Duration: 7.833333333333215
@ -308,7 +308,7 @@ MonoBehaviour:
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
    m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 59.750000000000114
+    m_PreExtrapolationTime: 30.916666666666714
    m_DisplayName: zhijin
  m_Markers:
    m_Objects: []
@ -378,7 +378,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: 77.23333
+        time: 48.4
        value: {x: 0, y: 360, z: 0}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -387,7 +387,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: 77.25
+        time: 48.416668
        value: {x: 0, y: 360, z: 0}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -422,7 +422,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: 77.23333
+        time: 48.4
        value: {x: 0, y: 0, z: 0}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -431,7 +431,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: 77.25
+        time: 48.416668
        value: {x: -0.9431999, y: 0, z: 0.08303991}
        inSlope: {x: 0, y: 0, z: 0}
        outSlope: {x: 0, y: 0, z: 0}
@ -477,7 +477,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 77.25
+    m_StopTime: 48.416668
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@ -516,7 +516,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.23333
+        time: 48.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -525,7 +525,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.25
+        time: 48.416668
        value: -0.9431999
        inSlope: 0
        outSlope: 0
@ -564,7 +564,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.23333
+        time: 48.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -573,7 +573,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.25
+        time: 48.416668
        value: 0
        inSlope: 0
        outSlope: 0
@ -612,7 +612,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.23333
+        time: 48.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -621,7 +621,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.25
+        time: 48.416668
        value: 0.08303991
        inSlope: 0
        outSlope: 0
@ -660,7 +660,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.23333
+        time: 48.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -669,7 +669,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.25
+        time: 48.416668
        value: 0
        inSlope: 0
        outSlope: 0
@ -708,7 +708,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.23333
+        time: 48.4
        value: 360
        inSlope: 0
        outSlope: 0
@ -717,7 +717,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.25
+        time: 48.416668
        value: 360
        inSlope: 0
        outSlope: 0
@ -756,7 +756,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.23333
+        time: 48.4
        value: 0
        inSlope: 0
        outSlope: 0
@ -765,7 +765,7 @@ AnimationClip:
        inWeight: 0.33333334
        outWeight: 0.33333334
      - serializedVersion: 3
-        time: 77.25
+        time: 48.416668
        value: 0
        inSlope: 0
        outSlope: 0
@ -858,7 +858,7 @@ MonoBehaviour:
    m_Start: 0
    m_ClipIn: 0
    m_Asset: {fileID: 7339715688119289970}
-    m_Duration: 77.35000000000001
+    m_Duration: 48.51666666666667
    m_TimeScale: 1
    m_ParentTrack: {fileID: -3275536234153770728}
    m_EaseInDuration: 0
@ -987,7 +987,7 @@ MonoBehaviour:
    m_Start: 0
    m_ClipIn: 0
    m_Asset: {fileID: -8598380649257887164}
-    m_Duration: 58.0833333333334
+    m_Duration: 29.25
    m_TimeScale: 1
    m_ParentTrack: {fileID: -2703544339307601112}
    m_EaseInDuration: 0
@ -1237,7 +1237,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.35000000000001
+    m_Start: 48.51666666666667
    m_ClipIn: 0
    m_Asset: {fileID: 1329117841565250254}
    m_Duration: 8.333333333333329
@ -1330,7 +1330,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.35000000000001
+    m_Start: 48.51666666666667
    m_ClipIn: 0
    m_Asset: {fileID: -167065129067652364}
    m_Duration: 8.333333333333329
@ -1423,7 +1423,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.3
+    m_Start: 48.46666666666666
    m_ClipIn: 0
    m_Asset: {fileID: -4815227724271581360}
    m_Duration: 0.03333333333333144
@ -1576,7 +1576,7 @@ MonoBehaviour:
    m_Start: 5.3
    m_ClipIn: 0
    m_Asset: {fileID: 8981282201505011638}
-    m_Duration: 52.76666666666667
+    m_Duration: 23.933333333333334
    m_TimeScale: 1
    m_ParentTrack: {fileID: 66005028718253906}
    m_EaseInDuration: 0
@ -1747,7 +1747,7 @@ MonoBehaviour:
    m_PreExtrapolationTime: 0
    m_DisplayName: Active
  - m_Version: 1
-    m_Start: 77.25
+    m_Start: 48.416666666666664
    m_ClipIn: 0
    m_Asset: {fileID: 6621488542193439360}
    m_Duration: 0.0833333333333286
@ -1840,7 +1840,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.33333333333333
+    m_Start: 48.49999999999999
    m_ClipIn: 0
    m_Asset: {fileID: 6176668146900321830}
    m_Duration: 8.350000000000009
@ -1936,7 +1936,7 @@ MonoBehaviour:
    m_Start: 0.13333333333333333
    m_ClipIn: 0
    m_Asset: {fileID: -3007199694414086925}
-    m_Duration: 77.44999999999999
+    m_Duration: 48.61666666666667
    m_TimeScale: 1
    m_ParentTrack: {fileID: 1552586439440554929}
    m_EaseInDuration: 0
@ -2063,8 +2063,8 @@ MonoBehaviour:
    m_Start: 0.16666666666666666
    m_ClipIn: 0
    m_Asset: {fileID: -1559407070450693043}
-    m_Duration: 57.916666666666664
-    m_TimeScale: 1
+    m_Duration: 28.958333333333332
+    m_TimeScale: 2
    m_ParentTrack: {fileID: 3225924538605475261}
    m_EaseInDuration: 0
    m_EaseOutDuration: 0
@ -2107,11 +2107,11 @@ MonoBehaviour:
    m_Recordable: 0
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0
+    m_PostExtrapolationTime: 0.125
    m_PreExtrapolationTime: 0.16666666666666666
    m_DisplayName: xishou
  - m_Version: 1
-    m_Start: 58.0833333333334
+    m_Start: 29.25
    m_ClipIn: 0
    m_Asset: {fileID: -1057080000440504889}
    m_Duration: 9.583333333333334
@ -2144,7 +2144,7 @@ MonoBehaviour:
    m_PreExtrapolationTime: 0
    m_DisplayName: cashou
  - m_Version: 1
-    m_Start: 67.66666666666686
+    m_Start: 38.83333333333344
    m_ClipIn: 0
    m_Asset: {fileID: 6569703868782280137}
    m_Duration: 9.583333333333334
@ -2239,7 +2239,7 @@ MonoBehaviour:
    m_Start: 0.16666666666666666
    m_ClipIn: 0
    m_Asset: {fileID: 4633432226228273864}
-    m_Duration: 77.08333333333333
+    m_Duration: 48.25
    m_TimeScale: 1
    m_ParentTrack: {fileID: 3509331748225263085}
    m_EaseInDuration: 0
@ -2341,7 +2341,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.35000000000001
+    m_Start: 48.51666666666667
    m_ClipIn: 0
    m_Asset: {fileID: -2308311139802995793}
    m_Duration: 8.333333333333334
@ -2389,7 +2389,7 @@ MonoBehaviour:
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
    m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 77.35000000000001
+    m_PreExtrapolationTime: 48.51666666666667
    m_DisplayName: Take 001
  m_Markers:
    m_Objects: []
@ -2445,7 +2445,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 59.750000000000114
+    m_Start: 30.916666666666714
    m_ClipIn: 0
    m_Asset: {fileID: -3080677517079988584}
    m_Duration: 7.249999999999886
@ -2541,7 +2541,7 @@ MonoBehaviour:
    m_Start: 5.3
    m_ClipIn: 0
    m_Asset: {fileID: 8101115430360630790}
-    m_Duration: 52.76666666666667
+    m_Duration: 23.933333333333334
    m_TimeScale: 1
    m_ParentTrack: {fileID: 5170104333835797471}
    m_EaseInDuration: 0
@ -2655,7 +2655,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 64.08333333333333
+    m_Start: 35.24999999999993
    m_ClipIn: 0
    m_Asset: {fileID: 2203995072649033969}
    m_Duration: 2.9166666666666714
@ -2748,7 +2748,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.33333333333333
+    m_Start: 48.49999999999999
    m_ClipIn: 0
    m_Asset: {fileID: -7153842856008424702}
    m_Duration: 8.291666666666671
@ -2814,7 +2814,7 @@ MonoBehaviour:
    m_PostExtrapolationMode: 1
    m_PreExtrapolationMode: 1
    m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 77.33333333333333
+    m_PreExtrapolationTime: 48.49999999999999
    m_DisplayName: Take 001
  m_Markers:
    m_Objects: []
@ -2892,7 +2892,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.35000000000001
+    m_Start: 48.51666666666667
    m_ClipIn: 0
    m_Asset: {fileID: 3844937128322434131}
    m_Duration: 8.333333333333329
@ -2985,7 +2985,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.33333333333333
+    m_Start: 48.49999999999999
    m_ClipIn: 0
    m_Asset: {fileID: -6572529648654993276}
    m_Duration: 8.350000000000009
@ -3081,7 +3081,7 @@ MonoBehaviour:
    m_Start: 0
    m_ClipIn: 0
    m_Asset: {fileID: 8960773400845392627}
-    m_Duration: 77.35000000000001
+    m_Duration: 48.51666666666667
    m_TimeScale: 1
    m_ParentTrack: {fileID: 6894725209904112198}
    m_EaseInDuration: 0
@ -3183,7 +3183,7 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 77.35000000000001
+    m_Start: 48.51666666666667
    m_ClipIn: 0
    m_Asset: {fileID: 6071230884551342930}
    m_Duration: 8.333333333333329
--- a/Assets/_Scenes/TrainExam.unity
+++ b/Assets/_Scenes/TrainExam.unity
@ -12913,6 +12913,111 @@ GameObject:
    type: 3}
  m_PrefabInstance: {fileID: 672948657}
  m_PrefabAsset: {fileID: 0}
+--- !u!1 &673468292
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 673468293}
+  - component: {fileID: 673468296}
+  - component: {fileID: 673468295}
+  - component: {fileID: 673468294}
+  m_Layer: 0
+  m_Name: Cube (1)
+  m_TagString: nohide
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &673468293
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 673468292}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.000000011913, y: -0.0009, z: -0.0034}
+  m_LocalScale: {x: 0.05625, y: 0.0019047655, z: 0.093874216}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5960970606987511619}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &673468294
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 673468292}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &673468295
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 673468292}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &673468296
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 673468292}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &679227515
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -16178,6 +16283,111 @@ Transform:
  - {fileID: 1506765895}
  m_Father: {fileID: 1302336992}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &863150095
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 863150096}
+  - component: {fileID: 863150099}
+  - component: {fileID: 863150098}
+  - component: {fileID: 863150097}
+  m_Layer: 0
+  m_Name: Cube (2)
+  m_TagString: nohide
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &863150096
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 863150095}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.0004, y: 0.039606903, z: -0.0034}
+  m_LocalScale: {x: 0.056834094, y: 0.0019245443, z: 0.048610114}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6350805675607165228}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &863150097
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 863150095}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &863150098
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 863150095}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &863150099
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 863150095}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &868477302
 GameObject:
  m_ObjectHideFlags: 0
@ -18105,7 +18315,7 @@ PrefabInstance:
    - target: {fileID: -3890471063164508258, guid: 6d0303911f413ab4391ab98ee2c2f263,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: -3890471063164508258, guid: 6d0303911f413ab4391ab98ee2c2f263,
        type: 3}
@ -26385,6 +26595,111 @@ Transform:
  m_Children: []
  m_Father: {fileID: 154116753}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1343255434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1343255435}
+  - component: {fileID: 1343255438}
+  - component: {fileID: 1343255437}
+  - component: {fileID: 1343255436}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: nohide
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1343255435
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1343255434}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.000000011913, y: 0.0398, z: -0.0034}
+  m_LocalScale: {x: 0.05625, y: 0.0019047655, z: 0.093874216}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5960970606987511619}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1343255436
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1343255434}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1343255437
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1343255434}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1343255438
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1343255434}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &1344588673
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -28162,6 +28477,111 @@ Transform:
  - {fileID: 1084228973}
  m_Father: {fileID: 271715889}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1463827440
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1463827441}
+  - component: {fileID: 1463827444}
+  - component: {fileID: 1463827443}
+  - component: {fileID: 1463827442}
+  m_Layer: 0
+  m_Name: Cube (3)
+  m_TagString: nohide
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1463827441
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1463827440}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.00040001172, y: -0.0015157394, z: -0.003399965}
+  m_LocalScale: {x: 0.056834094, y: 0.0019245443, z: 0.048610114}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6350805675607165228}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1463827442
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1463827440}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1463827443
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1463827440}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &1463827444
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1463827440}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1467276765
 GameObject:
  m_ObjectHideFlags: 0
@ -58934,6 +59354,8 @@ Transform:
  - {fileID: 3693435695467267977}
  - {fileID: 6856382518388375028}
  - {fileID: 8715972095644884415}
+  - {fileID: 1343255435}
+  - {fileID: 673468293}
  m_Father: {fileID: 985674199115698890}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &5967538651191108316
@ -60152,6 +60574,8 @@ Transform:
  - {fileID: 4329629908860498835}
  - {fileID: 884539167873392732}
  - {fileID: 1683811076882385907}
+  - {fileID: 863150096}
+  - {fileID: 1463827441}
  m_Father: {fileID: 985674199115698890}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6358864367496723450
@ -63755,7 +64179,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!23 &7424743025283422755
 MeshRenderer:
  m_ObjectHideFlags: 0
--- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs
+++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs
@ -89,6 +89,7 @@ namespace ZXK.LouDiXvMuNiu
        }
        private void Start()
        {
+            GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = new NiuData();
            GetCurModuleTools();
            InitFirstState();
            StartCoroutine("InitScene");
@ -112,7 +113,7 @@ namespace ZXK.LouDiXvMuNiu
            {
                _CurSceneStep = tempData[0];
            }
-            
+
            GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = _CurSceneStep;

            if (GameManager.Instance._loopPopExplain)
--- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs
+++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs
@ -231,6 +231,7 @@ namespace ZXK.LouDiXvMuNiu

        private void OnValueChanged(NiuData obj)
        {
+            if (obj == null) return;
            if (obj.ThreeTaskName != GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.ThreeTaskName)
            {//前后三级人物名字不同