修复BUG -1

Assets/FrameWork/AR.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2351110678720899162
+--- !u!1 &2351110680108509795
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,57 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2351110678720899161}
-  - component: {fileID: 2351110678720899160}
+  - component: {fileID: 2351110680108509794}
+  - component: {fileID: 8324041885649330723}
+  m_Layer: 0
+  m_Name: AR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2351110680108509794
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2351110680108509795}
+  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: 7534626386376439484}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8324041885649330723
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2351110680108509795}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 090ef0c1a4ae8154a9aab5f59bfac363, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  global: 1
+  cameraDevice: {fileID: 195740283170919905}
+  imageOnFind: {fileID: 1243550164254632030}
+  golist: []
+--- !u!1 &2918196324229211857
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4882166053977389484}
+  - component: {fileID: 1243550164254632030}
   m_Layer: 0
   m_Name: Image Tracker
   m_TagString: Untagged
@@ -17,28 +66,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2351110678720899161
+--- !u!4 &4882166053977389484
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110678720899162}
+  m_GameObject: {fileID: 2918196324229211857}
   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: 2351110679135064581}
+  m_Father: {fileID: 7534626386376439484}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2351110678720899160
+--- !u!114 &1243550164254632030
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110678720899162}
+  m_GameObject: {fileID: 2918196324229211857}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9f3bd5189df208f4ead26ed7eabd92cf, type: 3}
@@ -49,7 +98,7 @@ MonoBehaviour:
   resultType:
     EnablePersistentTargetInstance: 0
     EnableMotionFusion: 0
---- !u!1 &2351110679135064577
+--- !u!1 &5203046099404024148
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -57,57 +106,57 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2351110679135064581}
-  - component: {fileID: 2351110679135064582}
-  - component: {fileID: 2351110679135064583}
-  - component: {fileID: 2351110679135064576}
+  - component: {fileID: 7534626386376439484}
+  - component: {fileID: 6083796876932514070}
+  - component: {fileID: 6754721391942450956}
+  - component: {fileID: 6397499238133692567}
   m_Layer: 0
-  m_Name: AR Session (EasyAR)
+  m_Name: AR Session (EasyAR) (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2351110679135064581
+--- !u!4 &7534626386376439484
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679135064577}
+  m_GameObject: {fileID: 5203046099404024148}
   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: 2351110679746097939}
-  - {fileID: 2351110678720899161}
-  - {fileID: 2351110679596713784}
-  - {fileID: 2351110679568293634}
-  - {fileID: 2351110680174526694}
+  - {fileID: 1958644871704103952}
+  - {fileID: 4882166053977389484}
+  - {fileID: 6943408518401761615}
+  - {fileID: 2531938957939241908}
+  - {fileID: 2990444636615466957}
   m_Father: {fileID: 2351110680108509794}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2351110679135064582
+--- !u!114 &6083796876932514070
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679135064577}
+  m_GameObject: {fileID: 5203046099404024148}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 845309652a1ed494d89639fa567f4a29, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   ShowPopupMessage: 1
---- !u!114 &2351110679135064583
+--- !u!114 &6754721391942450956
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679135064577}
+  m_GameObject: {fileID: 5203046099404024148}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e26e4bdeab275034ab325a8c22a2b607, type: 3}
@@ -123,13 +172,13 @@ MonoBehaviour:
     FrameRecorder: {fileID: 0}
     FrameFilters: []
   EnableCustomCamera: 1
---- !u!114 &2351110679135064576
+--- !u!114 &6397499238133692567
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679135064577}
+  m_GameObject: {fileID: 5203046099404024148}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: e61c430477d9c324db3b8fbf8ea02a63, type: 3}
@@ -137,9 +186,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   CenterMode: 0
   HorizontalFlipNormal: 0
-  HorizontalFlipFront: 0
+  HorizontalFlipFront: 1
   specificTargetCenter: {fileID: 0}
---- !u!1 &2351110679568293635
+--- !u!1 &5943745042674919356
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -147,45 +196,76 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2351110679568293634}
-  - component: {fileID: 2351110679568293633}
+  - component: {fileID: 1958644871704103952}
+  - component: {fileID: 1889326830945592578}
+  - component: {fileID: 8099952996968915588}
+  - component: {fileID: 195740283170919905}
   m_Layer: 0
-  m_Name: Frame Recorder
+  m_Name: Camera Device
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2351110679568293634
+--- !u!4 &1958644871704103952
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679568293635}
+  m_GameObject: {fileID: 5943745042674919356}
   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: 2351110679135064581}
-  m_RootOrder: 3
+  m_Father: {fileID: 7534626386376439484}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2351110679568293633
+--- !u!114 &1889326830945592578
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5943745042674919356}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfaf5bea4c10a8141a92abc840879a12, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &8099952996968915588
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5943745042674919356}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 827d788c59357834d9adc4815a9a065c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &195740283170919905
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679568293635}
+  m_GameObject: {fileID: 5943745042674919356}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b40768300a6291547a6e26ee2c5018cd, type: 3}
+  m_Script: {fileID: 11500000, guid: dca8017ddc105e5488bf7ba9b4a177cd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  FilePathType: 0
-  FilePath: 
---- !u!1 &2351110679596713785
+  arCamera: {fileID: 532439614916671408}
+  FocusMode: 2
+  CameraSize: {x: 1280, y: 960}
+  CameraOpenMethod: 1
+  CameraType: 1
+  CameraIndex: 2
+  cameraPreference: 0
+--- !u!1 &6662863053181872402
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -193,73 +273,45 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2351110679596713784}
-  - component: {fileID: 2351110679596713789}
-  - component: {fileID: 2351110679596713790}
-  - component: {fileID: 2351110679596713791}
+  - component: {fileID: 2531938957939241908}
+  - component: {fileID: 2420526028893827264}
   m_Layer: 0
-  m_Name: Frame Player
+  m_Name: Frame Recorder
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2351110679596713784
+--- !u!4 &2531938957939241908
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679596713785}
+  m_GameObject: {fileID: 6662863053181872402}
   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: 2351110679135064581}
-  m_RootOrder: 2
+  m_Father: {fileID: 7534626386376439484}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2351110679596713789
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679596713785}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfaf5bea4c10a8141a92abc840879a12, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &2351110679596713790
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679596713785}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 827d788c59357834d9adc4815a9a065c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &2351110679596713791
+--- !u!114 &2420526028893827264
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679596713785}
+  m_GameObject: {fileID: 6662863053181872402}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1046a0bb047ad0045b78b6fea91459f2, type: 3}
+  m_Script: {fileID: 11500000, guid: b40768300a6291547a6e26ee2c5018cd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  arCamera: {fileID: 0}
   FilePathType: 0
   FilePath: 
-  worldRoot: {fileID: 0}
---- !u!1 &2351110679746097948
+--- !u!1 &7801181090216337251
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -267,76 +319,73 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2351110679746097939}
-  - component: {fileID: 2351110679746097936}
-  - component: {fileID: 2351110679746097937}
-  - component: {fileID: 2351110679746097938}
+  - component: {fileID: 6943408518401761615}
+  - component: {fileID: 833490859356118099}
+  - component: {fileID: 8942711379781904907}
+  - component: {fileID: 1302062107069651651}
   m_Layer: 0
-  m_Name: Camera Device
+  m_Name: Frame Player
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2351110679746097939
+--- !u!4 &6943408518401761615
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679746097948}
+  m_GameObject: {fileID: 7801181090216337251}
   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: 2351110679135064581}
-  m_RootOrder: 0
+  m_Father: {fileID: 7534626386376439484}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2351110679746097936
+--- !u!114 &833490859356118099
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679746097948}
-  m_Enabled: 1
+  m_GameObject: {fileID: 7801181090216337251}
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cfaf5bea4c10a8141a92abc840879a12, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &2351110679746097937
+--- !u!114 &8942711379781904907
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679746097948}
+  m_GameObject: {fileID: 7801181090216337251}
   m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 827d788c59357834d9adc4815a9a065c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &2351110679746097938
+--- !u!114 &1302062107069651651
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110679746097948}
+  m_GameObject: {fileID: 7801181090216337251}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dca8017ddc105e5488bf7ba9b4a177cd, type: 3}
+  m_Script: {fileID: 11500000, guid: 1046a0bb047ad0045b78b6fea91459f2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  arCamera: {fileID: 2351110680174526695}
-  FocusMode: 2
-  CameraSize: {x: 1280, y: 960}
-  CameraOpenMethod: 1
-  CameraType: 1
-  CameraIndex: 0
-  cameraPreference: 0
---- !u!1 &2351110680108509795
+  arCamera: {fileID: 0}
+  FilePathType: 0
+  FilePath: 
+  worldRoot: {fileID: 0}
+--- !u!1 &8133319652357008349
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -344,86 +393,37 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2351110680108509794}
-  - component: {fileID: 8324041885649330723}
+  - component: {fileID: 2990444636615466957}
+  - component: {fileID: 532439614916671408}
   m_Layer: 0
-  m_Name: AR
+  m_Name: Camera
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2351110680108509794
+--- !u!4 &2990444636615466957
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110680108509795}
+  m_GameObject: {fileID: 8133319652357008349}
   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: 2351110679135064581}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8324041885649330723
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110680108509795}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 090ef0c1a4ae8154a9aab5f59bfac363, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  global: 1
-  cameraDevice: {fileID: 2351110679746097938}
-  imageOnFind: {fileID: 2351110678720899160}
-  golist: []
---- !u!1 &2351110680174526689
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2351110680174526694}
-  - component: {fileID: 2351110680174526695}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: MainCamera
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2351110680174526694
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110680174526689}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.079806775, y: -0.1777209, z: 1.8507864}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2351110679135064581}
+  m_Father: {fileID: 7534626386376439484}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &2351110680174526695
+--- !u!20 &532439614916671408
 Camera:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2351110680174526689}
+  m_GameObject: {fileID: 8133319652357008349}
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2

Assets/FrameWork/ProjectManager/Image.prefab

@@ -14,6 +14,8 @@ GameObject:
   - component: {fileID: 4983239016688348473}
   - component: {fileID: -3935363561865819814}
   - component: {fileID: 225658386711112806}
+  - component: {fileID: 2970919837191319429}
+  - component: {fileID: 3790039448010503031}
   m_Layer: 5
   m_Name: Image
   m_TagString: Untagged
@@ -88,6 +90,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b9df92cc077b8924abbbb78762154fe0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  info: {fileID: 0}
 --- !u!114 &-3935363561865819814
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -141,3 +144,63 @@ MonoBehaviour:
   minScaleRatio: 0.8
   maxScaleRatio: 3
   isParentDrag: 0
+--- !u!114 &2970919837191319429
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4458167396202558435}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 761d3c9fbe9f13f47818f9c59cd6aa03, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  activation: 0
+  flattenAxis: 3
+  activeHandle: 6
+  m_HandlerAssets: {fileID: 0}
+  activeScaleMinRestrict: 1
+  scaleMinimum: 0.05
+  activeScaleMaxRestrict: 0
+  scaleMaximum: 2
+  BoundBoxCollider: {fileID: 0}
+  showRotationHandleForX: 1
+  showRotationHandleForY: 1
+  showRotationHandleForZ: 1
+  activeAxis: -2
+  RotateStartAudio: 4
+  RotateStopAudio: 3
+  ScaleStartAudio: 4
+  ScaleStopAudio: 3
+  RotateStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  RotateStopped:
+    m_PersistentCalls:
+      m_Calls: []
+  ScaleStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  ScaleStopped:
+    m_PersistentCalls:
+      m_Calls: []
+  Rotating:
+    m_PersistentCalls:
+      m_Calls: []
+  Scaling:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!65 &3790039448010503031
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4458167396202558435}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 640, y: 480, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}

Assets/FrameWork/ProjectManager/Main.prefab

@@ -169,7 +169,7 @@ RectTransform:
   m_Children:
   - {fileID: 956702594996278233}
   m_Father: {fileID: 4259667480389853181}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -446,6 +446,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1351349470932465109}
   - {fileID: 221609541322579967}
   - {fileID: 5352705607961661000}
   - {fileID: 5105696921889325718}
@@ -541,7 +542,7 @@ RectTransform:
   m_Children:
   - {fileID: 1390008858055746300}
   m_Father: {fileID: 4259667480389853181}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1104,7 +1105,7 @@ RectTransform:
   m_Children:
   - {fileID: 729867945097425802}
   m_Father: {fileID: 4259667480389853181}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1249,7 +1250,7 @@ RectTransform:
   m_Children:
   - {fileID: 6274260951702570677}
   m_Father: {fileID: 4259667480389853181}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1508,3 +1509,77 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
+--- !u!1001 &1351349470932070233
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 4259667480389853181}
+    m_Modifications:
+    - target: {fileID: 100012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_Name
+      value: dianchang
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -853
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+--- !u!4 &1351349470932465109 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
+  m_PrefabInstance: {fileID: 1351349470932070233}
+  m_PrefabAsset: {fileID: 0}

Assets/FrameWork/ProjectManager/Video.prefab

@@ -1,5 +1,140 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &749721202584256103
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 666559182271707706}
+  - component: {fileID: 5160689032060912135}
+  - component: {fileID: 87542339809082621}
+  m_Layer: 5
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &666559182271707706
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 749721202584256103}
+  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: 7255333946027317694}
+  m_RootOrder: 1
+  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: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5160689032060912135
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 749721202584256103}
+  m_CullTransparentMesh: 1
+--- !u!114 &87542339809082621
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 749721202584256103}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_sharedMaterial: {fileID: 8874737445518861689, guid: fb2cd06170cbccb45aeb2aa643b0e4d4, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &2413293942919352051
 GameObject:
   m_ObjectHideFlags: 0
@@ -15,6 +150,10 @@ GameObject:
   - component: {fileID: 1600708616988324897}
   - component: {fileID: 4417445769355942714}
   - component: {fileID: 896913970192546899}
+  - component: {fileID: 1414871591421899995}
+  - component: {fileID: 3362243953345517}
+  - component: {fileID: 5438118603808510079}
+  - component: {fileID: 5426571525118777255}
   m_Layer: 5
   m_Name: Video
   m_TagString: Untagged
@@ -35,6 +174,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2511260574871387210}
+  - {fileID: 666559182271707706}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -90,6 +230,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b9df92cc077b8924abbbb78762154fe0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  info: {fileID: 87542339809082621}
 --- !u!114 &1600708616988324897
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -201,6 +342,91 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!114 &1414871591421899995
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2413293942919352051}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ab938c0a73719d42b9f2a2ef9f79083, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &3362243953345517
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2413293942919352051}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4f89c6d0bf5d5a49a4f136667bd353e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ap: {fileID: 1414871591421899995}
+--- !u!114 &5438118603808510079
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2413293942919352051}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 761d3c9fbe9f13f47818f9c59cd6aa03, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  activation: 0
+  flattenAxis: 3
+  activeHandle: 6
+  m_HandlerAssets: {fileID: 0}
+  activeScaleMinRestrict: 1
+  scaleMinimum: 0.05
+  activeScaleMaxRestrict: 0
+  scaleMaximum: 2
+  BoundBoxCollider: {fileID: 0}
+  showRotationHandleForX: 1
+  showRotationHandleForY: 1
+  showRotationHandleForZ: 1
+  activeAxis: -2
+  RotateStartAudio: 4
+  RotateStopAudio: 3
+  ScaleStartAudio: 4
+  ScaleStopAudio: 3
+  RotateStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  RotateStopped:
+    m_PersistentCalls:
+      m_Calls: []
+  ScaleStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  ScaleStopped:
+    m_PersistentCalls:
+      m_Calls: []
+  Rotating:
+    m_PersistentCalls:
+      m_Calls: []
+  Scaling:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!65 &5426571525118777255
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2413293942919352051}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 640, y: 480, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1 &2915911613087114252
 GameObject:
   m_ObjectHideFlags: 0

Assets/FrameWork/ProjectManager/XunJian/进入任务/进入任务.prefab

@@ -1895,7 +1895,7 @@ RectTransform:
   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_AnchoredPosition: {x: 385.5, y: 0}
   m_SizeDelta: {x: 771, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7307238916267295113
@@ -3295,7 +3295,7 @@ RectTransform:
   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_AnchoredPosition: {x: 959.5, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &3001207142907341833
@@ -6610,7 +6610,7 @@ RectTransform:
   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_AnchoredPosition: {x: 385.5, y: 0}
   m_SizeDelta: {x: 499, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6636242897306529089
@@ -7465,19 +7465,19 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 135
       objectReference: {fileID: 0}
     - target: {fileID: 1046681076883175317, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -50
       objectReference: {fileID: 0}
     - target: {fileID: 2663175551128001469, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_Name
@@ -7493,19 +7493,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 405
       objectReference: {fileID: 0}
     - target: {fileID: 6534303979265014755, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -50
       objectReference: {fileID: 0}
     - target: {fileID: 7708746070731989160, guid: cb61b52cc83342e489699f3476640957, type: 3}
       propertyPath: playImg

Assets/HotUpdate/Scripts/LoginManager.cs

@@ -84,6 +84,7 @@ public class LoginManager : MonoSingleton<LoginManager>
             }
             else
             {
+                ShowInfoTipManager.Instance.showTip("密码长度不对");
                 LoginPassWordManager.Instance.toError();
             }
         }
@@ -167,28 +168,42 @@ public class LoginManager : MonoSingleton<LoginManager>
     public void LogingCallBack(string msg)
     {
         Debug.Log(msg);
-        JObject obj = JObject.Parse(msg);
-
-        if (obj["code"].ToString() == "200")
+        try
         {
-            isTongxun = true;
-            string token = obj["data"]["token"].ToString();
-            login.UserInfo.Instance.Token = token;
-            HttpEdustryAction.Token = token;
+
+            JObject obj = JObject.Parse(msg);
+
+            if (obj["code"].ToString() == "200")
+            {
+                isTongxun = false;
+                string token = obj["data"]["token"].ToString();
+                login.UserInfo.Instance.Token = token;
+                HttpEdustryAction.Token = token;
 
 
-            RoomFileMinio.Instance.islogin = true; 
-            testOk();
+                RoomFileMinio.Instance.islogin = true;
+                testOk();
+            }
+            else
+            {
+                ShowInfoTipManager.Instance.showTip("登录失败");
+                LoginPassWordManager.Instance.toError();
+                TimerMgr.Instance.CreateTimer(() => {
+                    ShowInfoTipManager.Instance.closeTip();
+                    isTongxun = false;
+                }, 1f);
+                // WindowsManager.Instance.show(WindowConfig.windowType.Tip2, false, obj["code"].ToString());
+            }
         }
-        else
+        catch
         {
+
             ShowInfoTipManager.Instance.showTip("登录失败");
             LoginPassWordManager.Instance.toError();
-            TimerMgr.Instance.CreateTimer(()=> {
+            TimerMgr.Instance.CreateTimer(() => {
                 ShowInfoTipManager.Instance.closeTip();
-                isTongxun = true;
-            },1f);
-            // WindowsManager.Instance.show(WindowConfig.windowType.Tip2, false, obj["code"].ToString());
+                isTongxun = false;
+            }, 1f);
         }
     }
 

Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -142,17 +142,17 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         {
             case RenWuModelType.SaoTu:
                 //ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.itemList[0]);
-                ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[0]);
+                ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex]);
                 break;
             case RenWuModelType.DingWeiBan:
                 // ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.itemList[0]);
-                ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[0]);
+                ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex]);
                 break;
         }
         //  TimerMgr.Instance.CreateTimer(()=> { showInit(); },5f);
     }
 
-    public void show()
+    public void show(bool isreport =false)
     {
         if (DianYunManager.Instance)
         {
@@ -169,7 +169,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         }
         else
         {
-            gotoNextItem(false);
+            gotoNextItem(isreport);
         }
         // if (XunJianDataManager.Instance.chooseXunJian != null)
         //    UpdateData();
@@ -659,10 +659,12 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
 
 
         //jsonData["dataFileIds"] = jobject;
-      
-        Debug.Log(JsonConvert.SerializeObject(rwitem));
-        if(report)
+
+        Debug.Log(" HttpEdustryAction.tasksReport  " + JsonConvert.SerializeObject(rwitem));
+        Debug.Log(" HttpEdustryAction.tasksReport  " + report);
+        if ((XunJianDataManager.Instance.chooseXunJian.nowIndex - 1)>=0)
         {
+            rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex-1];
             TasksReport tasks = new TasksReport();
             tasks.projectInspectionTaskId = rwitem.id;
             tasks.status = rwitem.status;
@@ -691,6 +693,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
     }
     public void GotoLieBiao()
     {
+        closeAll();
         if (ChangeCameraSaoMiao.Instance)
         {
 

Assets/HotUpdate/Scripts/Scripts/Main/ProjectMainWindow.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using XRTool.Util;
 
 public class ProjectMainWindow : WindowSingleton<ProjectMainWindow>
 {
@@ -12,6 +13,7 @@ public class ProjectMainWindow : WindowSingleton<ProjectMainWindow>
     public void showRtc()
     {
         ShowInfoTipManager.Instance.showTip("ÔÝ먦·Å,¾´ÇëÆÚ´ý");
+        TimerMgr.Instance.CreateTimer(()=> { ShowInfoTipManager.Instance.closeTip(); },2f);
         //WindowsManager.Instance.show(WindowConfig.windowType.RoomMain);
     }
 }

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -419,6 +419,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
     IEnumerator getList(Action<List<XunJianListData>> callback,int count)
     {
         xjDataList.Clear();
+        xjDataList = new List<XunJianListData>();
         for (int i = 1; i < (count/ getMaxCount) +2; i++)
         {
             JsonData jsonData = new JsonData();
@@ -665,10 +666,10 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             switch (data[i].regionMapType)
             {
                 case 0:
-                    xj.renwuModelType = RenWuModelType.None;
+                    xj.renwuModelType = RenWuModelType.SaoTu;
                     break;
                 case 1:
-                    xj.renwuModelType = RenWuModelType.None;
+                    xj.renwuModelType = RenWuModelType.SaoTu;
                     break;
                 case 2:
                     xj.renwuModelType = RenWuModelType.DianYun;
@@ -807,7 +808,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             chooseXunJian.projectState = "已完成";
         }
 
-        chooseXunJian.nowIndex++;
+      //  chooseXunJian.nowIndex++;
     }
 
     public void chooseItem(int i)

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ARSaoTuManager.cs

@@ -23,6 +23,10 @@ public class ARSaoTuManager : MonoSingleton<ARSaoTuManager>
         // 按K跳过扫图
         if (Input.GetKeyDown(KeyCode.K))
         {
+            if (XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].imageData != null)
+                Debug.Log("当前任务第" + XunJianDataManager.Instance.chooseXunJian.nowIndex + "个" + "识别图名称为" + "TargetImage_" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].imageData.Name);
+            else
+                Debug.Log("当前任务第" + XunJianDataManager.Instance.chooseXunJian.nowIndex + "个，没有识别图");
             if (XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].imageData != null)
             {
                 Debug.Log("showshowshowshowshowshow");
@@ -40,8 +44,10 @@ public class ARSaoTuManager : MonoSingleton<ARSaoTuManager>
     }
     public void startDevice()
     {
-        Debug.Log("打开startDevice");
+        XRRGBCamera.Instance.stopCamera();
+        Debug.Log("打开startDevice2");
         cameraDevice.Open();
+        JinRuRenwu.Instance.StartGo.SetActive(false);
     }
 
     private void OnLoad(ImageTargetController arg1, Target arg2, bool arg3)
@@ -50,12 +56,10 @@ public class ARSaoTuManager : MonoSingleton<ARSaoTuManager>
         {
             arg1.TargetFound += ()=> {
 
-                //if (XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1].imageData!=null&&arg1.name== "TargetImage_" + XunJianDataManager.Instance.chooseXunJian.itemList[ XunJianDataManager.Instance.chooseXunJian.nowIndex+1].imageData.Name)
-                //{
-                //    Debug.Log("showshowshowshowshowshow");
-                //    JinRuRenwu.Instance.show();
-                //    closeDevice();
-                //}
+                if(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].imageData != null)
+                    Debug.Log("当前任务第"+ XunJianDataManager.Instance.chooseXunJian.nowIndex+"个" + "识别图名称为"+ "TargetImage_" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].imageData.Name);
+                else
+                    Debug.Log("当前任务第" + XunJianDataManager.Instance.chooseXunJian.nowIndex + "个，没有识别图");
 
 
                 if (XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex ].imageData != null && arg1.name == "TargetImage_" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex ].imageData.Name)
@@ -65,6 +69,7 @@ public class ARSaoTuManager : MonoSingleton<ARSaoTuManager>
                     closeDevice();
                 }
 
+
             };
         }
     }
@@ -80,16 +85,20 @@ public class ARSaoTuManager : MonoSingleton<ARSaoTuManager>
 
     public void AddARGameObj(ImageFileSourceData listdata)
     {
-        XRRGBCamera.Instance.stopCamera();
-        startDevice();
+        Debug.Log("打开startDevice3");
+        Debug.Log("AddARGameObjAddARGameObjAddARGameObj");
         if (check(listdata))
         {
+            Debug.Log("checkcheckcheckcheckcheck1");
             GameObject go = new GameObject();
             go.name = "TargetImage_" + listdata.Name;
 
             ImageTargetController im = go.AddComponent<ImageTargetController>();
+            Debug.Log("checkcheckcheckcheckcheck2");
             im.ImageFileSource = listdata;
+            Debug.Log("checkcheckcheckcheckcheck3");
             imageOnFind.LoadTarget(im);
+            Debug.Log("checkcheckcheckcheckcheck4");
             /*
             im.ImageFileSource.Path = listdata[i].// Application.streamingAssetsPath + "/Art/16：9.jpg";
             im.ImageFileSource.Name = "jpg";

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/CaoZuoLanManager.cs

@@ -74,14 +74,16 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
     }
     public void gotoNextItem()
     {
+        Debug.Log("准备进入下一个任务==》总共任务：" + XunJianDataManager.Instance.chooseXunJian.tasksList.Count+ " 当前任务==》"+ XunJianDataManager.Instance.chooseXunJian.nowIndex);
         if (XunJianDataManager.Instance.chooseXunJian.tasksList.Count > (XunJianDataManager.Instance.chooseXunJian.nowIndex + 1))
         {
 
+            XunJianDataManager.Instance.chooseXunJian.nowIndex++;
             switch (XunJianDataManager.Instance.chooseXunJian.renwuModelType)
             {
                 case RenWuModelType.SaoTu:
                     JinRuRenwu.Instance.closeAll();
-                    ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1]);
+                    ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex]);
 
                     break;
                 case RenWuModelType.DianYun:
@@ -95,6 +97,11 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
                     break;
             }
 
+        }else
+        {
+            XunJianDataManager.Instance.chooseXunJian.nowIndex++;
+            JinRuRenwu.Instance.gotoNextItem();
+
         }
        //
     }

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ChangeCameraSaoMiao.cs

@@ -102,41 +102,56 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
 
         //});
 
-        for (int i = 0; i < ri.diagram.Count; i++)
+        if (ri.diagram.Count==0)
         {
-            // 下载识别图 处理
-
-            DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(ri.diagram[i].path, "minio"), (string bytes) =>
+            JinRuRenwu.Instance.show(true);
+        }
+        else
+        {
+            Debug.Log("打开startDevice42" + ri.diagram.Count);
+            for (int i = 0; i < ri.diagram.Count; i++)
             {
-                if (bytes == null)
+                Debug.Log("打开startDevice43" + ri.diagram[i].path);
+                // 下载识别图 处理
+
+                DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(ri.diagram[i].path, "minio"), (string bytes) =>
                 {
-                    close();
-                    JsonData data = new JsonData();
-                    data["type"] = "20001";
-                    List<string> backTip = new List<string>();
-                    backTip.Add(data.ToJson());
-                    backTip.Add(data.ToJson());
-                    backTip.Add(data.ToJson());
-                    WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "识别图未找到!" + rw.diagram, Color.gray, "icon", backTip, true, "识别图错误", 5).ToJson());
-
-                }
-                else
+                    if (bytes == null)
+                    {
+                        close();
+                        JsonData data = new JsonData();
+                        data["type"] = "20001";
+                        List<string> backTip = new List<string>();
+                        backTip.Add(data.ToJson());
+                        backTip.Add(data.ToJson());
+                        backTip.Add(data.ToJson());
+                        WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "识别图未找到!" + rw.diagram, Color.gray, "icon", backTip, true, "识别图错误", 5).ToJson());
+
+                    }
+                    else
+                    {
+                        ImageFileSourceData data = new ImageFileSourceData();
+                        data.Name = bytes.Split("/")[bytes.Split("/").Length - 1];
+                        data.Path = bytes;
+                        data.PathType = PathType.Absolute;
+                        data.Scale = 0.1f;
+                        rw.imageData = data;
+                        Debug.Log("打开startDevice1" + data.Path);
+                        Debug.Log("打开startDevice1" + data.Name);
+                        ARSaoTuManager.Instance.startDevice();
+                        Debug.Log("打开startDevice3");
+                        ARSaoTuManager.Instance.AddARGameObj(data);
+                        Debug.Log("打开startDevice4");
+                    }
+                }, (float f) =>
                 {
-                    ImageFileSourceData data = new ImageFileSourceData();
-                    data.Name = bytes.Split("/")[bytes.Split("/").Length - 1];
-                    data.Path = bytes;
-                    data.PathType = PathType.Absolute;
-                    data.Scale = 0.1f;
-                    rw.imageData = data;
-                    ARSaoTuManager.Instance.AddARGameObj(data);
-                }
-            }, (float f) =>
-            {
 
-            });
+                });
 
 
-         }
+            }
+
+        }
 
     }
 

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/RenWuListItemWindow.cs

@@ -55,29 +55,59 @@ public class RenWuListItemWindow : WindowSingleton<RenWuListItemWindow>
         this.data2 = data;
         info.text = (data.sort) + "." + data.title;
 
-        switch (data.state)
+        if(data.status!=0)
         {
-            case RenWuState.None:
-                info.color = Color.white;
-                NoneGo.SetActive(true);
-                FailGo.SetActive(false);
-                SuccessGo.SetActive(false);
-                break;
-            case RenWuState.Fail:
-                info.color = Color.red;
-                NoneGo.SetActive(false);
-                FailGo.SetActive(true);
-                SuccessGo.SetActive(false);
-                break;
-            case RenWuState.Success:
-                info.color = Color.green;
-                NoneGo.SetActive(false);
-                FailGo.SetActive(false);
-                SuccessGo.SetActive(true);
-                break;
+            switch (data.status)
+            {
+                case 0:
+                    info.color = Color.gray;
+                    NoneGo.SetActive(true);
+                    FailGo.SetActive(false);
+                    SuccessGo.SetActive(false);
+                    break;
+                case 1:
+                    info.color = Color.green;
+                    NoneGo.SetActive(false);
+                    FailGo.SetActive(false);
+                    SuccessGo.SetActive(true);
+                    break;
+                case 2:
+                    info.color = Color.red;
+                    NoneGo.SetActive(false);
+                    FailGo.SetActive(true);
+                    SuccessGo.SetActive(false);
+                    break;
+
+            }
+
+        }
+        else
+        {
+            switch (data.state)
+            {
+                case RenWuState.None:
+                    info.color = Color.gray;
+                    NoneGo.SetActive(true);
+                    FailGo.SetActive(false);
+                    SuccessGo.SetActive(false);
+                    break;
+                case RenWuState.Fail:
+                    info.color = Color.red;
+                    NoneGo.SetActive(false);
+                    FailGo.SetActive(true);
+                    SuccessGo.SetActive(false);
+                    break;
+                case RenWuState.Success:
+                    info.color = Color.green;
+                    NoneGo.SetActive(false);
+                    FailGo.SetActive(false);
+                    SuccessGo.SetActive(true);
+                    break;
+
+            }
 
         }
-        if (XunJianDataManager.Instance.chooseXunJian.nowIndex+1 == data.sort)
+        if (XunJianDataManager.Instance.chooseXunJian.nowIndex == data.sort-1)
         {
 
             info.color = Color.yellow;
@@ -85,6 +115,14 @@ public class RenWuListItemWindow : WindowSingleton<RenWuListItemWindow>
             FailGo.SetActive(false);
             SuccessGo.SetActive(false);
         }
+        if (XunJianDataManager.Instance.chooseXunJian.nowIndex+1 == data.sort-1)
+        {
+
+            info.color = Color.white;
+            NoneGo.SetActive(true);
+            FailGo.SetActive(false);
+            SuccessGo.SetActive(false);
+        }
     }
 
     public void chooseItem()

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/RenWuTypeWindow.cs

@@ -68,6 +68,7 @@ public class RenWuTypeWindow : MonoBehaviour
 
         this.transform.GetComponent<RectTransform>().anchoredPosition3D = Vector3.zero;
         this.transform.GetComponent<RectTransform>().localEulerAngles = Vector3.zero;
+        this.transform.GetComponent<RectTransform>().localScale = Vector3.one;
     }
 
     public void updateData(MinioResources data)
@@ -91,12 +92,18 @@ public class RenWuTypeWindow : MonoBehaviour
                 //    // info.gameObject.SetActive(true);
                 //    //info.text = "视频加载中" + f.ToString("F2")+"%";
                 //});
+                info.gameObject.SetActive(true);
+                info.text = "视频加载中";
+                this.GetComponent<RawImage>().enabled = false;
                 RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data.path, rfd =>
-                  {
-                      Debug.Log(rfd.url);
+                {
+                    info.gameObject.SetActive(false);
+                    info.text = "视频加载中";
+                    this.GetComponent<RawImage>().enabled = true;
+                    Debug.Log(rfd.url);
                       Debug.Log(rfd.bytes.Length);
                      // gameObject.SetActive(true);
-                     WindowsManager.Instance.StartCoroutine(SaveMp4(Application.persistentDataPath + "/" + data.uuid +".mp4", rfd.bytes));
+                     WindowsManager.Instance.StartCoroutine(SaveMp4(Application.persistentDataPath + "/" + data.uuid + Path.GetExtension(data.path), rfd.bytes));
 
                   });
                 break;
@@ -141,7 +148,7 @@ public class RenWuTypeWindow : MonoBehaviour
                     Debug.Log(rfd.url);
                     Debug.Log(rfd.bytes.Length);
                    // gameObject.SetActive(true);
-                    WindowsManager.Instance.StartCoroutine(SaveModel(Application.persistentDataPath + "/" + data.uuid + ".zip", rfd.bytes));
+                    WindowsManager.Instance.StartCoroutine(SaveModel(Application.persistentDataPath + "/" + data.uuid +Path.GetExtension( data.path), rfd.bytes));
                 });
 
                 break;
@@ -157,7 +164,7 @@ public class RenWuTypeWindow : MonoBehaviour
             // file.Delete();
             yield return new WaitForSeconds(0.02f);
             this.GetComponent<ShowVideoManager>().url = path;
-
+            this.GetComponent<ShowVideoManager>().playeVideo();
         }
         else
         {
@@ -170,6 +177,7 @@ public class RenWuTypeWindow : MonoBehaviour
             sw.Dispose();
             yield return new WaitForSeconds(0.02f);
             this.GetComponent<ShowVideoManager>().url = path;
+            this.GetComponent<ShowVideoManager>().playeVideo();
         }
 
     }

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ShowModelManager.cs

@@ -25,6 +25,7 @@ public class ShowModelManager : MonoBehaviour
 
         TriLibModelLoad.Load(url, (AssetLoaderContext ac) => {
             ac.RootGameObject.SetActive(false);
+            info.gameObject.SetActive(false);
             //Debug.Log("模型加载完成");
         }, (AssetLoaderContext ac) => {
             info.gameObject.SetActive(false);
@@ -46,10 +47,16 @@ public class ShowModelManager : MonoBehaviour
             ac.RootGameObject.transform.SetParent(this.transform);
             ac.RootGameObject.transform.localPosition = Vector3.zero- obj.transform.position * 1000;
             ac.RootGameObject.SetActive(true);
+            info.gameObject.SetActive(false);
         }, (AssetLoaderContext ac, float f) => {
 
             info.gameObject.SetActive(true);
             info.text = "模型努力加载中\n" + (f*100).ToString("F2") + "%";
+            if(f==1)
+            {
+                info.gameObject.SetActive(false);
+
+            }
             //Debug.Log("加载中==》" + f);
         }, (IContextualizedError error) => {
 

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ShowVideoManager.cs

@@ -9,25 +9,37 @@ public class ShowVideoManager : MonoBehaviour
     AVProVideoPlayer avpro;
     private void OnEnable()
     {
-        if(url!=null&& url!="")
+        playeVideo();
+    }
+
+    public void playeVideo()
+    {
+
+        if (url != null && url != "")
         {
             avpro = this.GetComponent<AVProVideoPlayer>();
             avpro.SetUrl(url);
             avpro.Play();
-            plbt.SetActive(false);
         }
+        plbt.SetActive(false);
     }
 
     public void StopOrPlay()
     {
-        if (avpro.IsPlaying())
-        {
-            plbt.SetActive(true);
-            avpro.Stop();
-        }else
+        if (url != null && url != "")
         {
-            plbt.SetActive(false);
-            avpro.Play();
+            avpro = this.GetComponent<AVProVideoPlayer>();
+            avpro.SetUrl(url);
+            if (avpro.IsPlaying())
+            {
+                plbt.SetActive(true);
+                avpro.Stop();
+            }
+            else
+            {
+                plbt.SetActive(false);
+                avpro.Play();
+            }
         }
     }
 

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoItem.cs

@@ -7,6 +7,7 @@ using TMPro;
 using Newtonsoft.Json.Linq;
 using LitJson;
 using Newtonsoft.Json;
+using XRTool.Util;
 
 public class XunJianLieBiaoItem : MonoBehaviour
 {
@@ -52,6 +53,8 @@ public class XunJianLieBiaoItem : MonoBehaviour
                 }
                 else
                 {
+                    ShowInfoTipManager.Instance.showTip("ÏîÄ¿·ÃÎʱ»¾Ü¾ø");
+                    TimerMgr.Instance.CreateTimer(()=> { ShowInfoTipManager.Instance.closeTip(); },2f);
                     data.tasksList = new List<XunJianTasks>();
                 }
             });

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoWindow.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
+using XRTool.Util;
 using static XunJianDataManager;
 
 public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
@@ -17,6 +18,7 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
     int MaxLiebiao=10;
     void refList()
     {
+        itemList = new List<GameObject>();
         GameObject liebiao = WindowsManager.Instance.GetPrefab(WindowConfig.windowType.XunJian, "liebiao");
         XunJianDataManager.Instance.GetXunJianCount((int data) => {
             for (int i = 0; i < MaxLiebiao; i++)
@@ -25,7 +27,6 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
                 itemGo.SetActive(false);
                 itemList.Add(itemGo);
             }
-            uiScroll.Init();
             uiScroll.InitList(0, data);
             XunJianDataManager.Instance.GetXunJianList((List<XunJianListData> data) =>
             {
@@ -79,9 +80,12 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
     {
         base.OnStart();
         uiScroll = parentGo.GetComponent<UIScrollScript>();
+        uiScroll.Init();
         RemoveAll();
         refList();
+        uiScroll.onUpdateItem -= ContentUpdateItem;
         uiScroll.onUpdateItem += ContentUpdateItem;
+        isExit = false;
         /*
         XunJianDataManager.Instance.page = 1;
         GameObject liebiao = WindowsManager.Instance.GetPrefab(WindowConfig.windowType.XunJian, "liebiao");
@@ -89,6 +93,23 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
           
         });*/
     }
+    public  bool isExit;
+    public override void OnEnable()
+    {
+        base.OnEnable();
+        if(uiScroll)
+        {
+            Debug.Log("HHHHHHHHHHHHGGGGGGGGGGGGGGG");
+            isExit = false;
+            RemoveAll();
+            refList();
+            uiScroll.onUpdateItem -= ContentUpdateItem;
+            uiScroll.onUpdateItem += ContentUpdateItem;
+
+        }
+       
+    }
+
 
     private void ContentUpdateItem(GameObject item, int wrapIndex, int realIndex)
     {
@@ -105,6 +126,7 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
     public void showRtc()
     {
         ShowInfoTipManager.Instance.showTip("ÔÝ먦·Å,¾´ÇëÆÚ´ý");
+        TimerMgr.Instance.CreateTimer(() => { ShowInfoTipManager.Instance.closeTip(); }, 2f);
         //WindowsManager.Instance.show(WindowConfig.windowType.RoomMain);
     }
 
@@ -114,6 +136,7 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
         {
             Destroy(itemList[i]);
         }
+        itemList = new List<GameObject>();
 
     }
 }

Assets/HotUpdate/Scripts/Scripts/RoomFileMinio.cs

@@ -27,8 +27,6 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
     Thread thread;
     private void Start()
     {
-        thread = new Thread(DoSomeWork);
-        thread.Start();
         islogin = false;
 
 
@@ -42,7 +40,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
     {
         while (true)
         {
-            Debug.Log(" DGJ  getFile DoSomeWork Update");
+          //  Debug.Log(" DGJ  getFile DoSomeWork Update");
             Thread.Sleep(1000);
         }
     }
@@ -94,7 +92,8 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
                                             //  rfd.url = Application.persistentDataPath + "/" + Path.GetFileName(url);
 
 
-                                          });
+                                          })
+                                         ;
 
         yield return minio.GetObjectAsync(getObjectArgs);
 

Assets/HotUpdate/Scripts/Scripts/TopManager.cs

@@ -29,6 +29,10 @@ public class TopManager : MonoSingleton<TopManager>
     public void exitUserOk()
     {
 
+        if (XunJianLieBiaoWindow.Instance)
+        {
+            XunJianLieBiaoWindow.Instance.isExit = true;
+        }
         if (ChangeCameraSaoMiao.Instance)
         {
 
@@ -41,6 +45,7 @@ public class TopManager : MonoSingleton<TopManager>
             WindowGenSui.Instance.jd = 30;
         LoginManager.Instance.ExitUser();
         WindowsManager.Instance.show(WindowConfig.windowType.Login);
+
     }
     private void OnEnable()
     {

Assets/HybridCLRGenerate/AOTGenericReferences.cs

@@ -240,14 +240,11 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 		// System.Collections.Generic.List<object> System.Collections.Generic.List<object>.ConvertAll<object>(System.Converter<object,object>)
 		// System.Collections.Generic.IEnumerable<Loom.DelayedQueueItem> System.Linq.Enumerable.Where<Loom.DelayedQueueItem>(System.Collections.Generic.IEnumerable<Loom.DelayedQueueItem>,System.Func<Loom.DelayedQueueItem,bool>)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,MinIoXR.<Run>d__23>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,MinIoXR.<Run>d__23&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,RoomFileMinio.<UploadFile>d__20>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,RoomFileMinio.<UploadFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,MinIoXR.<RunFile>d__20>(System.Runtime.CompilerServices.TaskAwaiter<object>&,MinIoXR.<RunFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,MinIoXR.<Run>d__23>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,MinIoXR.<Run>d__23&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,RoomFileMinio.<UploadFile>d__20>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,RoomFileMinio.<UploadFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,MinIoXR.<RunFile>d__20>(System.Runtime.CompilerServices.TaskAwaiter<object>&,MinIoXR.<RunFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<MinIoXR.<Run>d__23>(MinIoXR.<Run>d__23&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<MinIoXR.<RunFile>d__20>(MinIoXR.<RunFile>d__20&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<RoomFileMinio.<UploadFile>d__20>(RoomFileMinio.<UploadFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<MinIoXR.<<RunFile>b__20_0>d>(MinIoXR.<<RunFile>b__20_0>d&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<PaiZhaoDataManager.GetUploadObject.<>c__DisplayClass0_0.<<start>b__0>d>(PaiZhaoDataManager.GetUploadObject.<>c__DisplayClass0_0.<<start>b__0>d&)
 		// object& System.Runtime.CompilerServices.Unsafe.As<object,object>(object&)

Assets/HybridCLRGenerate/link.xml

@@ -172,7 +172,6 @@
     <type fullname="UnityEngine.Renderer" preserve="all" />
     <type fullname="UnityEngine.Rendering.AsyncGPUReadback" preserve="all" />
     <type fullname="UnityEngine.Rendering.AsyncGPUReadbackRequest" preserve="all" />
-    <type fullname="UnityEngine.Resources" preserve="all" />
     <type fullname="UnityEngine.ScriptableObject" preserve="all" />
     <type fullname="UnityEngine.SerializeField" preserve="all" />
     <type fullname="UnityEngine.Shader" preserve="all" />

Assets/Scenes/Edustry.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

Assets/StreamingAssets/old/HotUpdateScripts.meta

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

ProjectSettings/ProjectSettings.asset

@@ -147,6 +147,8 @@ PlayerSettings:
     Others: 1
   bundleVersion: 0.5.0
   preloadedAssets:
+  - {fileID: 2720162604194769745, guid: 6f45d16099e3af24c9d1814902f6c1cd, type: 2}
+  - {fileID: -1976151159784538485, guid: 2fc93d2ce72dd364f968f3400a68213b, type: 2}
   - {fileID: 4800000, guid: ea9a295053a0dc440b9698a7f41d9741, type: 3}
   - {fileID: 4800000, guid: 1499e61b3897c4a4b9318a56ca931b8a, type: 3}
   - {fileID: 4800000, guid: 798d6e253a35a144d94205b80c8fd48b, type: 3}
@@ -154,8 +156,6 @@ PlayerSettings:
   - {fileID: 4800000, guid: 58841e6e22debfc43ba09a0cf58cd92d, type: 3}
   - {fileID: 4800000, guid: a336f422ffebbec4c89b4dac26022d5f, type: 3}
   - {fileID: 11400000, guid: 852e6bd112d2b174996470390b08d3a7, type: 2}
-  - {fileID: 2720162604194769745, guid: 6f45d16099e3af24c9d1814902f6c1cd, type: 2}
-  - {fileID: -1976151159784538485, guid: 2fc93d2ce72dd364f968f3400a68213b, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -827,7 +827,7 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Android: UNITY_CCU;AVPRO_MOVIECAPTURE_WEBCAMTEXTURE_SUPPORT;AVPMC_ANDROID_VULKAN_PRETRANSFORM;CURVEDUI_TMP;ISLOCAL
+    Android: UNITY_CCU;AVPRO_MOVIECAPTURE_WEBCAMTEXTURE_SUPPORT;AVPMC_ANDROID_VULKAN_PRETRANSFORM;CURVEDUI_TMP
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: