修改妊娠鉴定停留时间短问题

修改妊娠鉴定动画

Assets/Resources/UIPrefabs/ManualPanel.prefab

@@ -0,0 +1,386 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1195881596899738185
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7789009551891283743}
+  - component: {fileID: 3470449171369013220}
+  - component: {fileID: 8807928742168966809}
+  - component: {fileID: 3973191185635739098}
+  m_Layer: 5
+  m_Name: ExitBtn_N
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7789009551891283743
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1195881596899738185}
+  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: 5361803559850328043}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -3, y: -5}
+  m_SizeDelta: {x: 40, y: 40}
+  m_Pivot: {x: 1, y: 1}
+--- !u!222 &3470449171369013220
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1195881596899738185}
+  m_CullTransparentMesh: 1
+--- !u!114 &8807928742168966809
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1195881596899738185}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 9225a255e7db0f94992879e3437ed1ad, type: 3}
+  m_Type: 0
+  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!114 &3973191185635739098
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1195881596899738185}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8807928742168966809}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &2039777963291904148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5361803559850328043}
+  - component: {fileID: 1553930566386711059}
+  - component: {fileID: 8855071403255317206}
+  m_Layer: 5
+  m_Name: ImgManualPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5361803559850328043
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039777963291904148}
+  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: 2714812001814004528}
+  - {fileID: 7789009551891283743}
+  m_Father: {fileID: 952834505729566731}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -19, y: 24}
+  m_SizeDelta: {x: 701.4331, y: 401.5704}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &1553930566386711059
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039777963291904148}
+  m_CullTransparentMesh: 1
+--- !u!114 &8855071403255317206
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2039777963291904148}
+  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: 1
+  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!1 &5086870096074481591
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 952834505729566731}
+  - component: {fileID: 4912004545673896718}
+  - component: {fileID: 4264195554242150045}
+  m_Layer: 5
+  m_Name: Content_N
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &952834505729566731
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5086870096074481591}
+  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: 5361803559850328043}
+  m_Father: {fileID: 1077642978620814662}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4912004545673896718
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5086870096074481591}
+  m_CullTransparentMesh: 1
+--- !u!114 &4264195554242150045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5086870096074481591}
+  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: 0, g: 0, b: 0, a: 0.5019608}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  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!1 &5533697061084249294
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1077642978620814662}
+  m_Layer: 5
+  m_Name: ManualPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1077642978620814662
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5533697061084249294}
+  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: 952834505729566731}
+  m_Father: {fileID: 0}
+  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: 1920, y: 1080}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8871036216933213282
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2714812001814004528}
+  - component: {fileID: 5877625784192185638}
+  - component: {fileID: 4576911020307033681}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2714812001814004528
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8871036216933213282}
+  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: 5361803559850328043}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -2.585907, y: 0}
+  m_SizeDelta: {x: 395.963, y: -15.4905}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5877625784192185638
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8871036216933213282}
+  m_CullTransparentMesh: 1
+--- !u!114 &4576911020307033681
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8871036216933213282}
+  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: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b911b8ef558cbf847ab3b45b44bc79a3, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Resources/UIPrefabs/ManualPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2d87ed3e6f3679f4e8f76394b9e75616
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/ExcelJson/NiuData.txt

@@ -6114,7 +6114,7 @@
     "ModuleName": "妊娠鉴定",
     "TaskName": "实际操作",
     "ThreeTaskName": "超声波检测法",
-    "TaskType": "动画",
+    "TaskType": "手动关闭",
     "ToolsName": "",
     "ModelBT": "pasted__SM_bchao",
     "Operation": "点击后，弹出图片弹窗（使用弹窗视频的那个UI即可）",

Assets/TimeLine/PTYZTimeLineCtrl.playable

@@ -919,10 +919,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 42.583333333333336
+    m_Start: 42.56666666666667
     m_ClipIn: 0
     m_Asset: {fileID: -1989977406723514564}
-    m_Duration: 55.85
+    m_Duration: 55.86666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: -5327545306820594903}
     m_EaseInDuration: 0
@@ -9321,10 +9321,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 42.58333333333331
+    m_Start: 42.56666666666667
     m_ClipIn: 0
     m_Asset: {fileID: -5208916746947036022}
-    m_Duration: 55.85000000000003
+    m_Duration: 55.86666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: 8611266147379885049}
     m_EaseInDuration: 0

Assets/_Scenes/TrainExam.unity

@@ -2524,6 +2524,11 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4092549413877331209, guid: 96e2e5a566a30a348ab66d087f8dbb7a,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -5441,108 +5446,6 @@ Transform:
   - {fileID: 1461033342}
   m_Father: {fileID: 1597360589}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &278246565
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 278246566}
-  - component: {fileID: 278246568}
-  - component: {fileID: 278246569}
-  - component: {fileID: 278246567}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &278246566
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278246565}
-  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: 2019538367}
-  m_Father: {fileID: 414910239}
-  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 &278246567
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278246565}
-  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!223 &278246568
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278246565}
-  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!114 &278246569
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 278246565}
-  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!1 &280883125
 GameObject:
   m_ObjectHideFlags: 0
@@ -8818,7 +8721,6 @@ Transform:
   m_Children:
   - {fileID: 130034247}
   - {fileID: 107011322}
-  - {fileID: 278246566}
   m_Father: {fileID: 1985453657}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &415137527
@@ -9298,81 +9200,6 @@ Transform:
   - {fileID: 1875329129}
   m_Father: {fileID: 682025333}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &442555767
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 442555768}
-  - component: {fileID: 442555770}
-  - component: {fileID: 442555769}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &442555768
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 442555767}
-  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: 2019538367}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -2.585907, y: 0}
-  m_SizeDelta: {x: 395.963, y: -15.4905}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &442555769
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 442555767}
-  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: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b911b8ef558cbf847ab3b45b44bc79a3, type: 3}
-  m_Type: 0
-  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 &442555770
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 442555767}
-  m_CullTransparentMesh: 1
 --- !u!1 &442693297
 GameObject:
   m_ObjectHideFlags: 0
@@ -18303,7 +18130,7 @@ PlayableDirector:
   - key: {fileID: 2635968313393430589, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2}
     value: {fileID: 1626746517}
   - key: {fileID: -4126499356004069609, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2}
-    value: {fileID: 2019538366}
+    value: {fileID: 0}
   - key: {fileID: -8858742156520860509, guid: 4284f9a6acb11c846b8a8f08f7120a56, type: 2}
     value: {fileID: 1322681215}
   - key: {fileID: 3509331748225263085, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2}
@@ -38250,82 +38077,6 @@ Transform:
   - {fileID: 1227832809}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2019538366
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2019538367}
-  - component: {fileID: 2019538369}
-  - component: {fileID: 2019538368}
-  m_Layer: 5
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &2019538367
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2019538366}
-  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: 442555768}
-  m_Father: {fileID: 278246566}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -19, y: 24}
-  m_SizeDelta: {x: 701.4331, y: 401.5704}
-  m_Pivot: {x: 1, y: 0}
---- !u!114 &2019538368
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2019538366}
-  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: 1
-  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 &2019538369
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2019538366}
-  m_CullTransparentMesh: 1
 --- !u!1 &2021612589
 GameObject:
   m_ObjectHideFlags: 0

Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs

@@ -755,6 +755,10 @@ namespace ZXK.LouDiXvMuNiu
             string[] answers = step.OptionsAll.Split("|");
             PopUpMng.PopAnswerQuestions(step.Question, answers, GetOptionIndex(step.OptionRight), () =>
             {
+                if (step.id == 236)
+                {
+                    UI_Manage.Instance.ClosePanel("ManualPanel");
+                }
                 JumpTimeline(GameManager.Instance._DataNiuHandler.GetNextStep(_CurSceneStep.QNextNum), false);
             });
         }

Assets/_Scripts/Application/UI/OperationStepPanel.cs

@@ -436,6 +436,33 @@ namespace ZXK.LouDiXvMuNiu
             {
                 NiuSceneMng._Instance.TimeTranAnmInStep(obj);
             }
+            if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_ImgManual))
+            {
+                if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState"))
+                {
+                    GameObject ImgManualGeo = UI_Manage.Instance.ShowPanel("ManualPanel", Type.GetType("CG.Framework.UIBase"), UIGroup.Tip);
+                    ImgManualGeo.transform.Find("Content_N/ImgManualPanel/ExitBtn_N").GetComponent<Button>().onClick.AddListener(() =>
+                    {
+                        UI_Manage.Instance.ClosePanel("ManualPanel");
+                        GameManager.Instance._DataNiuHandler.CurNiuHandler.Value = GameManager.Instance._DataNiuHandler.GetNextStep();
+                    });
+                }
+                else if (GameManager.Instance._StateContext.GetState().Name.Equals("ExamState"))
+                {
+                    if (string.IsNullOrEmpty(obj.Question))
+                    {
+                        NiuSceneMng._Instance.GetNeedClickTools(obj);
+                    }
+                    else
+                    {
+                        if (obj.id == 236)
+                        {
+                            GameObject ImgManualGeo = UI_Manage.Instance.ShowPanel("ManualPanel", Type.GetType("CG.Framework.UIBase"), UIGroup.Tip);
+                        }
+                        NiuSceneMng._Instance.AnswerSystemInStep(obj);
+                    }
+                }
+            }
             if (obj.TaskType.Equals(ConstCtrl.TASKTYPE_Finish))
             {
                 NiuSceneMng._Instance.TimelineContinue();

Assets/_Scripts/Framework/Utilities/ConstCtrl.cs

@@ -33,6 +33,7 @@ namespace CG.UTility
 		public const string TASKTYPE_PicExp = "图示说明";
 		public const string TASKTYPE_ShowGeo = "物品展示";
 		public const string TASKTYPE_Anim = "动画";
+		public const string TASKTYPE_ImgManual = "手动关闭";
 		public const string TASKTYPE_Tran = "过渡";
 		public const string TASKTYPE_TranAnim = "过渡动画";
 		public const string TASKTYPE_ChoiceVideoQuestion = "视频选择题";

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -26,7 +26,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 91203
+  controlID: 349
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -150,7 +150,7 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 91204
+  controlID: 350
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -170,8 +170,8 @@ MonoBehaviour:
     y: 0
     width: 920
     height: 387
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 5}
   m_Panes:
   - {fileID: 5}
@@ -633,14 +633,14 @@ MonoBehaviour:
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
-  m_2DMode: 0
+  m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.9145841, y: -2.1608133, z: 1.6434958}
+    m_Target: {x: 157.77075, y: 638.05493, z: -8.823873}
     speed: 2
-    m_Value: {x: -0.9145841, y: -2.1608133, z: 1.6434958}
+    m_Value: {x: 157.77075, y: 638.05493, z: -8.823873}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -668,17 +668,17 @@ MonoBehaviour:
       m_Size: {x: 1, y: 1}
     yGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
@@ -686,17 +686,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: 0.42765638, y: -0.001355869, z: 0.00064189476, w: 0.90394235}
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: 0.42765552, y: -0.0013558662, z: 0.0006418935, w: 0.9039405}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 0.59525406
+    m_Target: 853.32935
     speed: 2
-    m_Value: 0.59525406
+    m_Value: 853.32935
   m_Ortho:
-    m_Target: 0
+    m_Target: 1
     speed: 2
-    m_Value: 0
+    m_Value: 1
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
@@ -710,7 +710,7 @@ MonoBehaviour:
     m_FarClip: 10000
     m_DynamicClip: 1
     m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: 0.25165606, y: 0.40998748, z: -0.118779585, w: 0.86861044}
+  m_LastSceneViewRotation: {x: 0.42765638, y: -0.001355869, z: 0.00064189476, w: 0.90394235}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
@@ -807,8 +807,8 @@ MonoBehaviour:
     y: 0
     width: 342
     height: 939
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 9}
   m_Panes:
   - {fileID: 9}
@@ -852,9 +852,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 7c7a0000
+      m_SelectedIDs: bc62fbff
-      m_LastClickedID: 0
+      m_LastClickedID: -302404
-      m_ExpandedIDs: be10e7ffd272e7ffdec3e7ff981ce8ffe09fe8ffe4f4e8ffca51e9ffe09be9ff28eee9ffac42eaff7c4bebff9eafebff74f6ebfffe3cecff7ef8ecff82f8ecff92f9ecff68fcecffc6fdecffcafdecff2801edff2c01edff8a20edff8822edff8c22edff6426edff6826edff7827edffb22cedffb62cedff142eedfff22fedff6e34edff7234edffda35edff363bedffa23cedff8c5feeff905feeff985feeff9c5feeffa05feeffa45feeffe85feeffec5feefff05feefff45feeff6460eeff6860eeff6c60eeff9860eeff9c60eeffa060eeff9082eeffe62eefffda3defff9a3eefffcc76efff4297efff48c7efff925ff1ffecbaf1ff3a16f2ff346ff2ffaac5f2ff3ef0f2fff0a8f3fff4a8f3ff6caaf3ff4403f4ff940bf4ff4e53f4ffd254f4fffcc8f4ff00c9f4ff48caf4ff78caf4ffd004f5ffd404f5ff4806f5ff4e94f5ff5095f5ffaadbf5ffca22f6ff8823f6fff86ff6ff141ef7ffca4cf7ff284ef7ff1cb3f7ff1600f8ff1a00f8ff3445f8ff9e84f8ffa284f8ffa684f8ff26b3f8ff2ab3f8ff1cd7f8ffaad9f8ffc6def8fff6def8ff2626f9ff2a26f9ff9a26f9ff9e26f9ffa226f9ffce26f9ffe827f9ffec27f9ff5c28f9ff6028f9ff6428f9ff9028f9ff9428f9ff984ef9ff1efaf9ffd66cfaffda6cfaff4a6dfaff4e6dfaff526dfaff7e6dfaff826dfaff6a9afaff6e9afaffde9afaffe29afaffe69afaff129bfaff169bfaff58a2fafff2fafaff3264fbff2e65fbff3265fbffa265fbffa665fbffaa65fbffd665fbffda65fbff667bfbff6a7bfbff6e7bfbff727bfbffb67bfbffba7bfbffbe7bfbffc27bfbff327cfbff367cfbff3a7cfbff667cfbff6a7cfbffc09bfbffc49bfbffc89bfbffcc9bfbff109cfbff149cfbff189cfbff1c9cfbff8c9cfbff909cfbff949cfbffc09cfbffc49cfbffc89cfbff9e9dfbff84d9fbff88d9fbfff8d9fbfffcd9fbff00dafbff2cdafbff30dafbff04f7fbffdefbfbff1648fdff1a48fdff1e48fdff2248fdff6e48fdff7248fdffe248fdffe648fdffea48fdff1649fdff1a49fdffe07dfdffe47dfdffe87dfdffec7dfdff387efdff3c7efdffac7efdffb07efdffb47efdffe07efdffe47efdfff480fdfff880fdff0081fdff0481fdff0881fdff0c81fdff5081fdff5481fdff5881fdff5c81fdffcc81fdffd081fdffd481fdfff481fdfff881fdff0082fdff0482fdff0882fdff40e5fdff520bfeffc40bfeffe00bfeff400cfeff440cfeff8444feff489cffff8aecffff2efbfffff4ffffff64880100da880100de880100fa8c01005e8e0100fcbb010072bc010076bc010092c001005ec1010062c10100f6c1010008c8010062cd0100720c02000c110200e2110200e61102007a12020080280200f42802001a2d0200f42d0200882e0200f47502009a7a0200087c0200268202007cdd020022e20200fae20200fee2020092e302005e14030002190300ce190300661a0300ae480300524d03001e4e0300b64e0300cc50030040550300a2650300386a03009c6b0300e6d203007cd70300e0d80300ecda030060df030062200400cc24040062290400322a0400c62a0400d22c04004631040028360400a28b040040900400a491040078870500b8890500028d0500fc920500e6a0050026a3050070a605006aac0500ee250600a8290600842a0600e82b06000240060078400600fc450600904b0600c8ba060032bf06002cc50600accb060050cc06008ed0060098d0060064270700fa2b0700202d07005e2d0700984007002e45070092460700d2590700cc5f070006a6070084a607001aab07007eac07008aae0700fab2070074280800fa2808006c2f0800b44108003a420800ac480800
+      m_ExpandedIDs: 2066fbffb8d1fbff5017fdff6e32fdff7232fdfffa59fdff125afdff1a5afdff366dfdff44c6fdfff21bfeffb066feff10b5feff2efbfffff4ffffffb2b70100bcb8010032bc0100a2c20100cac20100a8ee0100c8ee0100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -949,8 +949,7 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders:
+    m_Folders: []
-    - Assets/_Scenes
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -966,7 +965,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: be940b00
     m_LastClickedID: 758974
-    m_ExpandedIDs: ffffffff00000000da770000dc770000827a0000927a0000ac7a00009c3501006ad201006ed2010070d2010074d20100a8d20100540a030006280300725d0300a4e8030042390600443906004639060048530600545306006e5306007e5306006ed20600
+    m_ExpandedIDs: ffffffff00000000e0770000e4770000ea770000ec770000fa770000fc770000fe77000000780000027800000478000006780000087800000a7800000c780000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -992,9 +991,9 @@ MonoBehaviour:
       m_ResourceFile: 
   m_AssetTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 7c7a0000
+    m_SelectedIDs: bc62fbff
-    m_LastClickedID: 31356
+    m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000da770000dc770000827a0000927a0000ac7a00009c3501006ad201006ed2010070d2010072d2010074d2010088d20100a8d2010006280300725d0300a4e8030042390600443906004639060048530600545306006e5306007e5306006ed20600
+    m_ExpandedIDs: ffffffff00000000e0770000e4770000ea770000ec770000fa770000fc770000fe77000000780000027800000478000006780000087800000a7800000c780000527b0000b0b501000ccf010046cf0100
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1019,8 +1018,8 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 7c7a0000
+    m_SelectedInstanceIDs: bc62fbff
-    m_LastClickedInstanceID: 31356
+    m_LastClickedInstanceID: -302404
     m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: 
     m_RenameOverlay: