修复UI中下一步按钮功能

Assets/Art/样本1.mp4.meta

@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 25ed6500075c2e745854fcd588a2cf09
+VideoClipImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/样本2.mp4.meta

@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: 109c42e122557614f8ef2eac0a7332bd
+VideoClipImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/样本3.mp4.meta

@@ -0,0 +1,18 @@
+fileFormatVersion: 2
+guid: ff5a13da64a9de44284b7b06d186c925
+VideoClipImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/UIPrefabs/ThreeVideoChoicePrefab.prefab

@@ -1897,7 +1897,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9035975256074769845}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 

Assets/StreamingAssets/AVProVideo/样本1.mp4.meta

@@ -1,7 +1,18 @@
 fileFormatVersion: 2
-guid: 25ed6500075c2e745854fcd588a2cf09
+guid: f80a390564ed1ff4cbe93a64d041f99a
-DefaultImporter:
+VideoClipImporter:
   externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/StreamingAssets/AVProVideo/样本2.mp4.meta

@@ -1,7 +1,18 @@
 fileFormatVersion: 2
-guid: 109c42e122557614f8ef2eac0a7332bd
+guid: 27341da4e5d866c4f898af24b64d4cbd
-DefaultImporter:
+VideoClipImporter:
   externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/StreamingAssets/AVProVideo/样本3.mp4.meta

@@ -1,7 +1,18 @@
 fileFormatVersion: 2
-guid: ff5a13da64a9de44284b7b06d186c925
+guid: 72f545a4b5144804980bed83275e89f9
-DefaultImporter:
+VideoClipImporter:
   externalObjects: {}
+  serializedVersion: 2
+  frameRange: 0
+  startFrame: -1
+  endFrame: -1
+  colorSpace: 0
+  deinterlace: 0
+  encodeAlpha: 0
+  flipVertical: 0
+  flipHorizontal: 0
+  importAudio: 1
+  targetSettings: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/_Scenes/TrainExam.unity

@@ -5218,6 +5218,74 @@ SkinnedMeshRenderer:
     m_Center: {x: -0.008787647, y: -0.20557393, z: -3.421051}
     m_Extent: {x: 0.13842213, y: 0.5559083, z: 3.54528}
   m_DirtyAABB: 0
+--- !u!1 &366650827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 366650829}
+  - component: {fileID: 366650828}
+  m_Layer: 0
+  m_Name: Video Player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!328 &366650828
+VideoPlayer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 366650827}
+  m_Enabled: 1
+  m_VideoClip: {fileID: 32900000, guid: 25ed6500075c2e745854fcd588a2cf09, type: 3}
+  m_TargetCameraAlpha: 0
+  m_TargetCamera3DLayout: 0
+  m_TargetCamera: {fileID: 0}
+  m_TargetTexture: {fileID: 8400000, guid: aeebca6b916493f428ca4fb4ef732238, type: 2}
+  m_TimeReference: 0
+  m_TargetMaterialRenderer: {fileID: 0}
+  m_TargetMaterialProperty: <noninit>
+  m_RenderMode: 2
+  m_AspectRatio: 2
+  m_DataSource: 0
+  m_TimeUpdateMode: 2
+  m_PlaybackSpeed: 1
+  m_AudioOutputMode: 2
+  m_TargetAudioSources:
+  - {fileID: 0}
+  m_DirectAudioVolumes:
+  - 1
+  m_Url: 
+  m_EnabledAudioTracks: 01
+  m_DirectAudioMutes: 01
+  m_ControlledAudioTrackCount: 1
+  m_PlayOnAwake: 0
+  m_SkipOnDrop: 1
+  m_Looping: 1
+  m_WaitForFirstFrame: 1
+  m_FrameReadyEventEnabled: 0
+  m_VideoShaders: []
+--- !u!4 &366650829
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 366650827}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2028155713}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &382832188
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -11385,6 +11453,78 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.012064827, y: 0.012094441, z: 0.010596243}
   m_Center: {x: 0.0003692358, y: -0.00034328023, z: -0.0006460552}
+--- !u!1 &787641518
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 787641519}
+  - component: {fileID: 787641521}
+  - component: {fileID: 787641520}
+  m_Layer: 5
+  m_Name: RawImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &787641519
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 787641518}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1903215258}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 442.5095, y: 442.5095}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &787641520
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 787641518}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 8400000, guid: aeebca6b916493f428ca4fb4ef732238, type: 2}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!222 &787641521
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 787641518}
+  m_CullTransparentMesh: 1
 --- !u!1 &792369442
 GameObject:
   m_ObjectHideFlags: 0
@@ -12628,7 +12768,7 @@ PlayableDirector:
   m_GameObject: {fileID: 909784101}
   m_Enabled: 1
   serializedVersion: 3
-  m_PlayableAsset: {fileID: 11400000, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2}
+  m_PlayableAsset: {fileID: 11400000, guid: 14ab057cfc8d23f4bb0769e6931bb0ee, type: 2}
   m_InitialState: 0
   m_WrapMode: 2
   m_DirectorUpdateMode: 1
@@ -13054,9 +13194,15 @@ PlayableDirector:
     value: {fileID: 422360622}
   - key: {fileID: 3323380152842018163, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2}
     value: {fileID: 783669278}
+  - key: {fileID: 1552418582665186781, guid: 14ab057cfc8d23f4bb0769e6931bb0ee, type: 2}
+    value: {fileID: 1903215257}
   m_ExposedReferences:
     m_References:
     - 335a0b1c4f8ab3e4a9c25efaa7f82a49: {fileID: 567124863}
+    - e4f3811563b1d7749b9764f067c9f227: {fileID: 366650828}
+    - 6cf3754f3c87d9a4db0725555a666860: {fileID: 366650828}
+    - 91282c1b6d4479444974579794f25a77: {fileID: 366650828}
+    - c33785dd1d1668f4687826d223d14666: {fileID: 366650828}
 --- !u!1 &911638469
 GameObject:
   m_ObjectHideFlags: 0
@@ -13446,6 +13592,108 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 32.23065, y: 3.2404656, z: 13.672196}
   m_Center: {x: 0.00024414062, y: -1.1368684e-13, z: -0.00023651123}
+--- !u!1 &945241468
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 945241469}
+  - component: {fileID: 945241472}
+  - component: {fileID: 945241471}
+  - component: {fileID: 945241470}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &945241469
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 945241468}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1903215258}
+  m_Father: {fileID: 2028155713}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &945241470
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 945241468}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &945241471
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 945241468}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 1
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &945241472
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 945241468}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: -1
+  m_TargetDisplay: 0
 --- !u!1 &949034340
 GameObject:
   m_ObjectHideFlags: 0
@@ -22523,6 +22771,82 @@ Transform:
   m_Children: []
   m_Father: {fileID: 25860873}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1903215257
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1903215258}
+  - component: {fileID: 1903215260}
+  - component: {fileID: 1903215259}
+  m_Layer: 5
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1903215258
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1903215257}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 787641519}
+  m_Father: {fileID: 945241469}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -81, y: 78}
+  m_SizeDelta: {x: 800, y: 458}
+  m_Pivot: {x: 1, y: 0}
+--- !u!114 &1903215259
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1903215257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: dc67bb695f3c9844787eb5de8e7fc38a, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1903215260
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1903215257}
+  m_CullTransparentMesh: 1
 --- !u!1 &1915360561
 GameObject:
   m_ObjectHideFlags: 0
@@ -22824,6 +23148,7 @@ Transform:
   - {fileID: 821119536}
   - {fileID: 662923396}
   - {fileID: 897551305}
+  - {fileID: 2028155713}
   - {fileID: 1865600646}
   - {fileID: 414910239}
   m_Father: {fileID: 909784103}
@@ -23242,6 +23567,39 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2025662239}
   m_Mesh: {fileID: -7628297149760489497, guid: 617a73c9cd85d5b40bea334946c9ee97, type: 3}
+--- !u!1 &2028155712
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2028155713}
+  m_Layer: 0
+  m_Name: JZLVJC
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2028155713
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2028155712}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 945241469}
+  - {fileID: 366650829}
+  m_Father: {fileID: 1985453657}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2029554992
 GameObject:
   m_ObjectHideFlags: 0

Assets/_Scripts/Application/DataModel/AZBSData/DataNiuHandler.cs

@@ -67,12 +67,13 @@ namespace ZXK.LouDiXvMuNiu
             });
         }
 
-        public NiuData GetNextStep()
+        public NiuData GetNextStep(NiuData curStep=null)
         {
+            if (curStep == null) curStep = CurNiuHandler.Value;
             List<NiuData> tempData = GameManager.Instance._DataNiuHandler.NiuStepTypeDic[GameManager.Instance._CurModelType];
             for (int i = 0; i < tempData.Count; i++)
             {
-                if (tempData[i].id == CurNiuHandler.Value.id + 1)
+                if (tempData[i].id == curStep.id + 1)
                 {
                     return tempData[i];
                 }

Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs

@@ -287,6 +287,26 @@ namespace ZXK.LouDiXvMuNiu
         /// <param name="step"></param>
         public List<GameObject> GetNeedClickTools(NiuData step)
         {
+            List<GameObject> triGeos = new List<GameObject>();
+            List<NiuData> tempData = GameManager.Instance._DataNiuHandler.NiuStepTypeDic[GameManager.Instance._CurModelType];
+            for (int i = 0; i < tempData.Count; i++)
+            {
+                if (tempData[i].TaskType==ConstCtrl.TASKTYPE_Tran) continue;
+                string[] tris = tempData[i].ModelBT.Split("|");
+                for (int j = 0; j < tris.Length; j++)
+                {
+                    GameObject toolGeo = UtilitiesMng.GetGeoByName(new Transform[1] { transform }, tris[j], true);
+                    if (toolGeo && !triGeos.Contains(toolGeo))
+                    {
+                        if (toolGeo.name.Contains("sign"))
+                        {
+                            toolGeo.SetActive(false);
+                        }
+                        triGeos.Add(toolGeo);
+                    }
+                }
+            }
+
             _curStepUseBTDic = new Dictionary<bool, List<GameObject>>();
             List<GameObject> toolTemp = new List<GameObject>();
             string[] tempBtArray = step.ModelBT.Split("+");

Assets/_Scripts/Application/UI/OperationStepPanel.cs

@@ -256,6 +256,16 @@ namespace ZXK.LouDiXvMuNiu
                 }
             }
 
+            if (GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.TaskType == ConstCtrl.TASKTYPE_Video)
+            {
+                UI_Manage.Instance.ClosePanel("VideoShowPanel");
+                UI_Manage.Instance.ClosePanel("VideoShowNoCtrlPanel");
+            }
+            if (GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue.TaskType == ConstCtrl.TASKTYPE_ChoiceVideoQuestion)
+            {
+                UI_Manage.Instance.ClosePanel("ThreeVideoChoicePrefab");
+            }
+
             UpdateTaskType(obj);
 
             UpdateSelectItem(obj);
@@ -547,7 +557,12 @@ namespace ZXK.LouDiXvMuNiu
             _nextBtn.onClick.AddListener(() =>
             {
                 if (NiuSceneMng._Instance._IsPlayAnm) return;
-                GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
+                NiuData nextStep= GameManager.Instance._DataNiuHandler.GetNextStep();
+                if (nextStep.TaskType == ConstCtrl.TASKTYPE_Tran)
+                {
+                    nextStep = GameManager.Instance._DataNiuHandler.GetNextStep(nextStep);
+                }
+                GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = nextStep;
             });
         }