Merge branch 'DGJ' of ssh://192.168.3.110:3397/JH/pointcloud into DGJ

# Conflicts:
#	Assets/Prefabs/MainDargGames1.prefab

Assets/Prefabs/MainDargGames2.prefab

@@ -1196,6 +1196,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 3533093034353290814}
     m_Modifications:
+    - target: {fileID: -927199367670048503, guid: ea35cb83529c9714bbc9c05340d538a9,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u8D8A\u738B\u52FE\u8DF5\u5251 (1)"
+      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: ea35cb83529c9714bbc9c05340d538a9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1251,11 +1256,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 180
       objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: ea35cb83529c9714bbc9c05340d538a9,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u8D8A\u738B\u52FE\u8DF5\u5251 (1)"
-      objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: ea35cb83529c9714bbc9c05340d538a9,
         type: 3}
       propertyPath: m_Materials.Array.data[0]

Assets/Prefabs/MainDargGames4.prefab

@@ -182,6 +182,188 @@ Light:
   m_UseBoundingSphereOverride: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
+--- !u!1 &376232808843776707
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5427345524901389358}
+  - component: {fileID: 2727193929448854303}
+  m_Layer: 0
+  m_Name: Area Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5427345524901389358
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376232808843776707}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.395, y: 0, z: -0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2942046310108410625}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!108 &2727193929448854303
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376232808843776707}
+  m_Enabled: 1
+  serializedVersion: 9
+  m_Type: 3
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 2
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: -8.806384e+20, z: 4.5904e-41, w: -5.4861243e-31}
+  m_UseBoundingSphereOverride: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!1 &940416325679460622
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2265679386199487137}
+  - component: {fileID: 2885977191481854649}
+  m_Layer: 0
+  m_Name: Point Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &2265679386199487137
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 940416325679460622}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.455}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2942046310108410625}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &2885977191481854649
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 940416325679460622}
+  m_Enabled: 1
+  serializedVersion: 9
+  m_Type: 2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
 --- !u!1 &2868912458093687437
 GameObject:
   m_ObjectHideFlags: 0
@@ -486,6 +668,8 @@ Transform:
   - {fileID: 2942046312001311896}
   - {fileID: 752623659}
   - {fileID: 1802815759}
+  - {fileID: 2265679386199487137}
+  - {fileID: 5427345524901389358}
   - {fileID: 146564287974395619}
   - {fileID: 5625681687054615046}
   m_Father: {fileID: 0}
@@ -1035,7 +1219,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2942046310108410625}
-  m_RootOrder: 3
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!108 &7333244223163883443
 Light:
@@ -1126,7 +1310,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2942046310108410625}
-  m_RootOrder: 4
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!108 &3236623149630274342
 Light:
@@ -1395,6 +1579,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2942046312001311896}
     m_Modifications:
+    - target: {fileID: 3401288987323543784, guid: fa45140108c783b449d3419290eb6ff1,
+        type: 3}
+      propertyPath: m_Name
+      value: ChinaBrock Mesh Sequence Player
+      objectReference: {fileID: 0}
     - target: {fileID: 3401288987323543780, guid: fa45140108c783b449d3419290eb6ff1,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1465,11 +1654,6 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.744
       objectReference: {fileID: 0}
-    - target: {fileID: 3401288987323543784, guid: fa45140108c783b449d3419290eb6ff1,
-        type: 3}
-      propertyPath: m_Name
-      value: ChinaBrock Mesh Sequence Player
-      objectReference: {fileID: 0}
     - target: {fileID: 3401288987323543785, guid: fa45140108c783b449d3419290eb6ff1,
         type: 3}
       propertyPath: PlaybackMode

Assets/Resources/OBE/FuJian.XML

@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<BaseList>
+  <View  id="6" subtasks="打开设备包装" taskStatus="0" pos="excel_dikuang_1" content="开箱前检测,请带上手套,做好防尘措施.扫描设备配置单ModelS/N二维码,确认设备机型开始检测流程" mainSubtasks="附件" endResultViewPos="ResultView1" tag="1" code="1S20QEZ4KYUSPF1P4Q21" />
+  <View  id="7" subtasks="清点相关配件" taskStatus="0" pos="excel_dikuang_2" content="扫描Serial Number,确认二维码与系统数据一致" mainSubtasks="附件" endResultViewPos="ResultView2" tag="1" code="SPF1P4Q21" />
+  <View  id="8" subtasks="扫描电源线二维码" taskStatus="0" pos="excel_dikuang_3" content="请人工对比ES LOGO是否有图改,表面有无损毁" mainSubtasks="附件" endResultViewPos="ResultView3" tag="2" code="0" />
+  <View  id="9" subtasks="扫描扫描适配器二维码 code" taskStatus="0" pos="excel_dikuang_4" content="扫描UPC code,确认二维码与系统数据一致" mainSubtasks="附件" endResultViewPos="ResultView4" tag="1" code="193386983477" />
+  <View  id="10" subtasks="扫描VGA CABLE二维码" taskStatus="0" pos="excel_dikuang_5" content="扫描IMEI,确认二维码与系统数据一致," mainSubtasks="附件" endResultViewPos="ResultView5" tag="1" code="015184006299197" />
+  <View  id="11" subtasks="扫描产品手册二维码" taskStatus="0" pos="excel_dikuang_6" content="请人工对比FCC logo是否有图改,表面有无损毁," mainSubtasks="附件" endResultViewPos="ResultView6" tag="2" code="0" />
+  <View  id="12" subtasks="扫描IJ45 二维码" taskStatus="0" pos="excel_dikuang_7" content="请人工对比是否与图片一致，正面X1 logo和ThinkPad logo,反面防火logo是否有图改，表面有无损毁" mainSubtasks="附件" endResultViewPos="ResultView7" tag="2" code="0" />
+</BaseList>

Assets/Resources/OBE/FuJian.XML.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 46b7e62c908a35148ad7b7f2e4065b29
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/OBE/PeiZhi.XML

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<BaseList>
+  <View  id="13" subtasks="进行产品配置检查" taskStatus="0" pos="excel_dikuang_1" content="请检查产品正面是否有X1图片和产品logo,是否有图改,
+表面有无损毁" mainSubtasks="配置" endResultViewPos="ResultView1" tag="2" code="0" />
+  <View  id="14" subtasks="请检查屏幕及双摄像头" taskStatus="0" pos="excel_dikuang_2" content="请检查设备内部显示屏幕是否有划痕与指纹印记,
+检查双摄像头是否有划痕" mainSubtasks="配置" endResultViewPos="ResultView2" tag="2" code="0" />
+  <View  id="15" subtasks="请检查掌托面-UPPER" taskStatus="0" pos="excel_dikuang_3" content="请检查设备掌托面-UPPER,确认触控板有弹性" mainSubtasks="配置" endResultViewPos="ResultView3" tag="2" code="0" />
+  <View  id="16" subtasks="请检查掌托右侧指纹识别" taskStatus="0" pos="excel_dikuang_4" content="请检查掌托右侧指纹识别,是否有划痕与指纹印记" mainSubtasks="配置" endResultViewPos="ResultView4" tag="2" code="0"  />
+  <View  id="17" subtasks="请检查掌托左侧Inter标签" taskStatus="0" pos="excel_dikuang_5" content="请检查掌托左侧Inter标签,是否有图改或者表面损毁" mainSubtasks="配置" endResultViewPos="ResultView5" tag="2" code="0" />
+  <View  id="18" subtasks="请检查SN码与IMEI" taskStatus="0" pos="excel_dikuang_6" content="请翻转到底部,检查底座-SN码与IMEI标志是否有图改,
+表面有无损毁" mainSubtasks="配置" endResultViewPos="ResultView6" tag="2" code="0" />
+  <View  id="19" subtasks="请检查底部windows标签" taskStatus="0" pos="excel_dikuang_7" content="请检查底部windows标签,是否有划痕与指纹印记" mainSubtasks="配置" endResultViewPos="ResultView7" tag="2" code="0" />
+</BaseList>

Assets/Resources/OBE/PeiZhi.XML.meta

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

Assets/Resources/ResultView.prefab

@@ -0,0 +1,328 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1123450895524684
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4212043299348922}
+  - component: {fileID: 114655840879907762}
+  m_Layer: 0
+  m_Name: ResultView
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4212043299348922
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1123450895524684}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: -0.00000035762784}
+  m_LocalPosition: {x: 0.047471322, y: 0.0335, z: 0.00044440315}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 4219174270915946}
+  - {fileID: 4623752863548830}
+  - {fileID: 4634477387991066}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &114655840879907762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1123450895524684}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cee13c39b8fc19246b15f05c982e5330, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  text_id: {fileID: 102462755932981990}
+  text_Tag: {fileID: 102993303856987974}
+  text_status: {fileID: 102992385201820374}
+  tatus: 0
+--- !u!1 &1470688597021818
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4634477387991066}
+  - component: {fileID: 23226853957534826}
+  - component: {fileID: 102992385201820374}
+  m_Layer: 0
+  m_Name: excel_tab_result
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4634477387991066
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1470688597021818}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.1102, y: 0.0048, z: 0}
+  m_LocalScale: {x: 0.0015156955, y: 0.0014602119, z: 1.1480939}
+  m_Children: []
+  m_Father: {fileID: 4212043299348922}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23226853957534826
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1470688597021818}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &102992385201820374
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1470688597021818}
+  m_Text: "\u5F85\u68C0\u6D4B"
+  m_OffsetZ: 0
+  m_CharacterSize: 1.07
+  m_LineSpacing: 1
+  m_Anchor: 0
+  m_Alignment: 0
+  m_TabSize: 4
+  m_FontSize: 55
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4286216826
+--- !u!1 &1515581804902576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4623752863548830}
+  - component: {fileID: 23132668249047338}
+  - component: {fileID: 102993303856987974}
+  m_Layer: 0
+  m_Name: excel_tab_tag
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4623752863548830
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1515581804902576}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.005150677, y: 0.0065414, z: 0}
+  m_LocalScale: {x: 0.001574894, y: 0.0015386146, z: 1.1929352}
+  m_Children: []
+  m_Father: {fileID: 4212043299348922}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23132668249047338
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1515581804902576}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 6c57b2d9f3037ce49a9f3a9b01f1c117, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &102993303856987974
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1515581804902576}
+  m_Text: "\u8BF7\u68C0\u67E5\u638C\u6258\u53F3\u4FA7\u6307\u7EB9\u8BC6\u522B"
+  m_OffsetZ: 0
+  m_CharacterSize: 1.07
+  m_LineSpacing: 1
+  m_Anchor: 0
+  m_Alignment: 0
+  m_TabSize: 4
+  m_FontSize: 55
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 12800000, guid: be46ac9ac78b62a4ebc7105aceef99e2, type: 3}
+  m_Color:
+    serializedVersion: 2
+    rgba: 1358954495
+--- !u!1 &1584035838015764
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4219174270915946}
+  - component: {fileID: 23616965401547322}
+  - component: {fileID: 102462755932981990}
+  m_Layer: 0
+  m_Name: excel_tab_id
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4219174270915946
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1584035838015764}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.0073, y: 0.0065414, z: 0}
+  m_LocalScale: {x: 0.001574894, y: 0.0015386146, z: 1.1929353}
+  m_Children: []
+  m_Father: {fileID: 4212043299348922}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &23616965401547322
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1584035838015764}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 6c57b2d9f3037ce49a9f3a9b01f1c117, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!102 &102462755932981990
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1584035838015764}
+  m_Text: 16
+  m_OffsetZ: 0
+  m_CharacterSize: 1.07
+  m_LineSpacing: 1
+  m_Anchor: 0
+  m_Alignment: 0
+  m_TabSize: 4
+  m_FontSize: 55
+  m_FontStyle: 0
+  m_RichText: 1
+  m_Font: {fileID: 12800000, guid: be46ac9ac78b62a4ebc7105aceef99e2, type: 3}
+  m_Color:
+    serializedVersion: 2
+    rgba: 1358954495

Assets/Resources/ResultView.prefab.meta

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

Assets/Resources/ScenesPrefab/Gongye.prefab

@@ -3067,7 +3067,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3686629967280414381
 Transform:
   m_ObjectHideFlags: 0
@@ -3141,7 +3141,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 355290b5ae025194ea4be9c374b36f15, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  functionInfos: []
 --- !u!1 &3686629967282912897
 GameObject:
   m_ObjectHideFlags: 0
@@ -39787,6 +39786,8 @@ GameObject:
   - component: {fileID: 4766986697094570340}
   - component: {fileID: 4873660539167447228}
   - component: {fileID: 4873211165250596114}
+  - component: {fileID: 8168073036716176445}
+  - component: {fileID: 5770740568776917254}
   m_Layer: 0
   m_Name: excel_grounp
   m_TagString: Untagged
@@ -39883,6 +39884,40 @@ MonoBehaviour:
   inspecyList: {fileID: 4873660539167447228}
   inspectListPanel: {fileID: 4873301956884772262}
   objParent: {fileID: 4769924472726728460}
+--- !u!114 &8168073036716176445
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4769880890734227844}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 49eb8c19dc6eea84cb9c4532d7fe1ead, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inspectListObj: {fileID: 0}
+  xmldata: {fileID: 4900000, guid: 46b7e62c908a35148ad7b7f2e4065b29, type: 3}
+  inspecyList: {fileID: 4873660539167447228}
+  inspectListPanel: {fileID: 4873301956884772262}
+  objParent: {fileID: 4770026937369071540}
+--- !u!114 &5770740568776917254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4769880890734227844}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 66a31f619499996448af02e549294013, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  inspectListObj: {fileID: 0}
+  xmldata: {fileID: 4900000, guid: a00fe61b8f7251146ae97b6f35c14bc3, type: 3}
+  inspecyList: {fileID: 4873660539167447228}
+  inspectListPanel: {fileID: 4873301956884772262}
+  objParent: {fileID: 4769924808702586422}
 --- !u!1 &4769881239547311968
 GameObject:
   m_ObjectHideFlags: 0
@@ -71028,8 +71063,8 @@ MonoBehaviour:
   tagText_Two: {fileID: 4853515209103815830}
   text_Content: {fileID: 4853472871462506650}
   readWX: {fileID: 4873211165250596114}
-  readFJ: {fileID: 0}
-  readPZ: {fileID: 0}
+  readFJ: {fileID: 8168073036716176445}
+  readPZ: {fileID: 5770740568776917254}
   inspectList: {fileID: 4873660539167447228}
   show_Photo_Video_Model:
   - {fileID: 4770444372744774960}

Assets/Resources/config/gongyedata.json

@@ -0,0 +1,64 @@
+{
+		"moduleID": 3,
+		"functionID": 2,
+		"defaultValue": 0,
+		"isShowState": 1,
+		"contentInfos": [{
+				"content": "检查USB3.0接口线"
+			},
+			{
+				"content": "检查F_PANEL接口线"
+			},
+			{
+				"content": "检查二维码"
+			},
+			{
+				"content": "检查风扇运转情况"
+			},
+			{
+				"content": "检查主板供电发光线"
+			},
+			{
+				"content": "打开设备包装"
+			},
+			{
+				"content": "清点相关配件"
+			},
+			{
+				"content": "扫描电源线二维码"
+			},
+			{
+				"content": "扫描扫描适配器二维码"
+			},
+			{
+				"content": "扫描VGA CABLE二维码"
+			},
+			{
+				"content": "扫描产品手册二维码"
+			},
+			{
+				"content": "扫描IJ45 二维码"
+			},
+			{
+				"content": "进行产品配置检查"
+			},
+			{
+				"content": "请检查屏幕及双摄像头"
+			},
+			{
+				"content": "请检查掌托面-UPPER"
+			},
+			{
+				"content": "请检查掌托右侧指纹识别"
+			},
+			{
+				"content": "扫请检查掌托左侧Inter标签"
+			},
+			{
+				"content": "请检查SN码与IMEI"
+			},
+			{
+				"content": "请检查底部windows标签"
+			}
+		]
+}

Assets/Resources/config/gongyedata.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 42892e9c95ae87948a6fc94b58096e41
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/OBESprite/InspectList.cs

@@ -46,8 +46,7 @@ public class InspectList : MonoBehaviour
                 ShowBaseListView("WaiXiang");
                 clickFrame.transform.DOMove(button[0].transform.position, 0.5f);
                 showTextTag(tagText[0]);
-
-                //inspectListPanel.taskIndex = 0;
+                inspectListPanel.ShowHandleClick(0);
                 break;
 
             case "buttonTag2":  //附件
@@ -55,7 +54,7 @@ public class InspectList : MonoBehaviour
                 clickFrame.transform.DOMove(button[1].transform.position, 0.5f);
                 showTextTag(tagText[1]);
 
-                // inspectListPanel.taskIndex = 7;
+                inspectListPanel.ShowHandleClick(5);
 
 
                 break;
@@ -64,6 +63,7 @@ public class InspectList : MonoBehaviour
                 ShowBaseListView("PeiZhi");
                 showTextTag(tagText[2]);
                 clickFrame.transform.DOMove(button[2].transform.position, 0.5f);
+                inspectListPanel.ShowHandleClick(12);
                 break;
         }
     }

Assets/Script/OBESprite/InspectListButtonEvent.cs

@@ -10,15 +10,13 @@ public class InspectListButtonEvent : BaseView
     public string str = "clickBar";
     private FunctionInfo _engineeringFunction;
 
-    private GongYeContral GongYe;
+
 
     public override void Start()
     {
         isSelect = false;
         AddEvent();
         inspectListPanel = GameObject.Find("Notebook_grounp").GetComponent<InspectListPanel>();
-        GongYe = GameObject.Find("Gongye").GetComponent<GongYeContral>();
-        _engineeringFunction = GongYe.functionInfos.FirstOrDefault(f => f.moduleID == 3 && f.functionID == 2);
     }
 
     public override void OnClick(BaseEventData data)

Assets/Script/OBESprite/InspectListPanel.cs

@@ -10,12 +10,6 @@ public class InspectListPanel : MonoBehaviour
 {
     public GongYeContral GongYe;
 
-    public static bool isBQREC = false;
-    public static string bQResult;
-
-    public static bool isWUPECB = false;
-    public static string wupcb;
-
     // Use this for initialization
     public static int taskIndex = 0;
     public List<GameObject> taskList = new List<GameObject>();
@@ -52,13 +46,32 @@ public class InspectListPanel : MonoBehaviour
 
     public int saoMa; //1 pass 2 no pass
     public int yuYin;//1 pass 2 no pass
-    private FunctionInfo _engineeringFunction;
-    private List<FunctionValue> _currFVList;
+    private List<FunctionValue> _currFVList;  //所有步骤
     private bool isBegain = true;//控制第一条待检测。
+
+    private bool m_IsFirstActiveTrue = true;
     private void Awake()
     {
 
     }
+
+    private void OnEnable()
+    {
+        if (!m_IsFirstActiveTrue)
+        {
+            PlaySounds(-2);
+            soundsAudioSource = Resources.Load("PlaySounds") as GameObject;
+            GameObject sounds = Instantiate(soundsAudioSource, soundsParent.transform.position, Quaternion.identity);
+            sounds.transform.parent = soundsParent.transform;
+            sounds.name = "playSounds0";
+            sounds.GetComponent<PlaySounds>().soundName = "sound0";
+
+            show_Photo_Video_Model[taskIndex].SetActive(false);  //将当前选中的步骤面板播放内容隐藏
+            isBegain = true;
+            StartInitialize();
+            StartCoroutine(StartshowHand());
+        }
+    }
     void Start()
     {
         PlaySounds(-2);
@@ -69,33 +82,27 @@ public class InspectListPanel : MonoBehaviour
         sounds.GetComponent<PlaySounds>().soundName = "sound0";
 
 
-        //BarScanEventCallback.logMBSRD += Testing_Pass_or_NoPass;
-        //WakeUpEventCallback.logWUECB += Testing_Pass_or_NoPass_YuYin;
         leftButton_show.gameObject.SetActive(false);
         rightButton_show.gameObject.SetActive(false);
-        GongYe.functionChangleAction += EngineeringFunctionChangler;
-        _engineeringFunction = GongYe.functionInfos.FirstOrDefault(f => f.moduleID == 3 && f.functionID == 2);
-        StartInitialize();
         // 克隆一份数据
-        _currFVList = GongYe.GetFunctionValues(_engineeringFunction.functionValues);
+        _currFVList = new List<FunctionValue>();
+        _currFVList.AddRange(GongYe.FunctionValues);
+        StartInitialize();
         StartCoroutine(StartshowHand());
 
-
-
-        //  StartCoroutine(StartUse(0f));//开始发送状态
     }
+
     /// <summary>
     /// 初始化项目
     /// </summary>
     private void StartInitialize()
     {
         taskIndex = 0;
-        for (int i = 0, count = _engineeringFunction.functionValues.Count; i < count; i++)
+        for (int i = 0, count = _currFVList.Count; i < count; i++)
         {
-            _engineeringFunction.functionValues[i].value = 0;
+            _currFVList[i].value = 0;
         }
-        _engineeringFunction.functionValues[0].isShow = true;
-        //GameManager.Instance.SendFunctionInfo2S(_engineeringFunction);
+        _currFVList[0].isShow = true;
     }
 
     IEnumerator StartshowHand()
@@ -107,20 +114,16 @@ public class InspectListPanel : MonoBehaviour
         }
     }
 
-    public void ShowHandleClick(int taskIndex)
-    {
-        SetEngineeringFunctionInfo(taskIndex);
-        SelectInspectResultButton();
-        ///ShowDetection(taskIndex);
-        //ShowContent(taskIndex);
-    }
     /// <summary>
-    /// 手动点击待检测状态
+    /// 根据传入的步骤ID显示当前步骤
     /// </summary>
-    public void ShowDetection(int taskIndex)
+    /// <param name="taskIndex">步骤ID</param>
+    public void ShowHandleClick(int taskIndex)
     {
         SetEngineeringFunctionInfo(taskIndex);
+        SelectInspectResultButton();
     }
+
     /// <summary>
     /// 状态
     /// </summary>
@@ -128,50 +131,29 @@ public class InspectListPanel : MonoBehaviour
     /// <param name="newValue"></param>
     private void SetEngineeringFunctionInfo(int index, int newValue)
     {
-        _engineeringFunction.functionValues[index].value = newValue;
         _currFVList[index].value = newValue;
-        //GameManager.Instance.SendFunctionInfo2S(_engineeringFunction);
     }
     // 是否选中（待检测状态）
     private void SetEngineeringFunctionInfo(int index)
     {
         isBegain = false;
-        foreach (var item in _engineeringFunction.functionValues)
+        foreach (var item in _currFVList)
         {
             item.isShow = item.index == index ? true : false;
             _currFVList[item.index].isShow = item.isShow;
         }
-        //GameManager.Instance.SendFunctionInfo2S(_engineeringFunction);
     }
+
     /// <summary>
-    /// 控制端点击事件
+    /// 刷新状态
     /// </summary>
-    private void RefreshInfo()
-    {
-        int _changeIndex = -1;
-        SelectInspectResultButton();
-        for (int i = 0, count = _engineeringFunction.functionValues.Count; i < count; i++)
-        {
-            if (_currFVList[i] != null)
-            {
-                if (_currFVList[i].value != _engineeringFunction.functionValues[i].value)
-
-                {
-                    _changeIndex = _engineeringFunction.functionValues[i].index;
-                    Debug.Log(_engineeringFunction.functionValues[i].index + " " + i);
-                    // 处理状态变化的逻辑
-                    RefreshState(_changeIndex, _currFVList[i].value, _engineeringFunction.functionValues[i].value);
-                    _currFVList[i].value = _engineeringFunction.functionValues[i].value;
-                    break;
-                }
-            }
-        }
-    }
-
+    /// <param name="changeIndex"></param>
+    /// <param name="prevValue"></param>
+    /// <param name="currValue"></param>
     private void RefreshState(int changeIndex, int prevValue, int currValue)
     {
         Debug.LogWarning($"当前改变的index {changeIndex} 从{prevValue} 改变为{currValue}");
-        taskList[changeIndex].GetComponent<InspectList_Button>().startInspect = (StartInspect)_engineeringFunction.functionValues[changeIndex].value;
+        taskList[changeIndex].GetComponent<InspectList_Button>().startInspect = (StartInspect)_currFVList[changeIndex].value;
         taskList[changeIndex].GetComponent<InspectList_Button>().SetBtnState();
         if (currValue == 2 || currValue == 3)
         {
@@ -185,8 +167,23 @@ public class InspectListPanel : MonoBehaviour
                     case StartInspect.qualified:
                     case StartInspect.Unqualified:
                         //选中状态
-                        SetEngineeringFunctionInfo(nextIndex);
-                        SelectInspectResultButton();
+                        if (nextIndex == 0)
+                        {
+                            inspectList.UserClick("buttonTag1");
+                        }
+                        else if (nextIndex == 5)
+                        {
+                            inspectList.UserClick("buttonTag2");
+                        }
+                        else if (nextIndex == 12)
+                        {
+                            inspectList.UserClick("buttonTag3");
+                        }
+                        else
+                        {
+                            SetEngineeringFunctionInfo(nextIndex);
+                            SelectInspectResultButton();
+                        }
                         break;
                     default:
                         break;
@@ -197,7 +194,6 @@ public class InspectListPanel : MonoBehaviour
                 MakeLastSound();//结算面板
             }
         }
-
     }
     /// <summary>
     /// 对应的步骤面板被选中
@@ -205,7 +201,7 @@ public class InspectListPanel : MonoBehaviour
     private void SelectInspectResultButton()
     {
         isBegain = false;
-        foreach (var item in _engineeringFunction.functionValues)
+        foreach (var item in _currFVList)
         {
             taskList[item.index].GetComponent<InspectList_Button>().OnSelect(item.isShow);
             show_Photo_Video_Model[item.index].SetActive(item.isShow);
@@ -221,13 +217,6 @@ public class InspectListPanel : MonoBehaviour
         }
     }
 
-    private void EngineeringFunctionChangler(int moduleID, int functionID, FunctionType functionType, List<FunctionValue> functionValues)
-    {
-        if (moduleID == 3 && functionID == 2 && functionType == FunctionType.FlowValue)
-        {
-            RefreshInfo();
-        }
-    }
     // Update is called once per frame
     void Update()
     {
@@ -249,28 +238,12 @@ public class InspectListPanel : MonoBehaviour
             rightButton.SetActive(false);
             rightButton_show.SetActive(false);
         }
-        if (isBQREC)
-        {
-
-            //if (BarScanEventCallback.logMBSRD != null)
-            //{
-            //    BarScanEventCallback.logMBSRD(bQResult);
-            //}
-
-            isBQREC = false;
-        }
-        if (isWUPECB)
-        {
-            //if (WakeUpEventCallback.logWUECB != null)
-            //{
-            //    WakeUpEventCallback.logWUECB(wupcb);
-            //}
-            isWUPECB = false;
-        }
-
-
     }
 
+    /// <summary>
+    /// 当点击中间页面的上一步、下一步按钮
+    /// </summary>
+    /// <param name="butoonName"></param>
     public void ButtonUserClick(string butoonName)
     {
         isBegain = false;
@@ -325,15 +298,11 @@ public class InspectListPanel : MonoBehaviour
             rightButton_show.gameObject.SetActive(false);
             isMakeSound = false;
         }
-        //  ShowContent(taskIndex);
 
 
     }
     void OnDestroy()
     {
-        GongYe.functionChangleAction -= EngineeringFunctionChangler;
-        //BarScanEventCallback.logMBSRD -= Testing_Pass_or_NoPass;
-        //WakeUpEventCallback.logWUECB -= Testing_Pass_or_NoPass_YuYin;
     }
 
     public void Testing_Pass_or_NoPass(String message)
@@ -543,6 +512,28 @@ public class InspectListPanel : MonoBehaviour
         }
         AudioManager.Instance.AudioGongYe_OBE_LanguageSounds(soundNames);
     }
+
+    private void OnDisable()
+    {
+        //关闭结算面板，显示内容面板
+        baseViewPanel.SetActive(true);//列表面板
+        contentPanel1.SetActive(true); //内容面板1
+        contentPanel2.SetActive(true);//内容面板2
+        settlementPanel.SetActive(false);//结算面板
+
+        //使所有步骤回归未检测状态
+        for (int i = 0; i < _currFVList.Count; i++)
+        {
+            taskList[i].GetComponent<InspectList_Button>().startInspect = StartInspect.Undetected;
+            taskList[i].GetComponent<InspectList_Button>().SetBtnState();
+        }
+        //左右按钮不可见
+        leftButton_show.gameObject.SetActive(false);
+        rightButton_show.gameObject.SetActive(false);
+        //回到外箱检测页面
+        inspectList.UserClick("buttonTag1");
+        m_IsFirstActiveTrue = false;
+    }
 }
 
 

Assets/Script/OBESprite/InspectSettlementPanel.cs

@@ -99,6 +99,7 @@ public class InspectSettlementPanel : MonoBehaviour
                     startPos = ResultViewListParent_FuJian.Find(inspectList.taskList[i].GetComponent<InspectList_Button>().endResultViewPos).gameObject.transform;
                     GameObject obj = Instantiate(resultView, new Vector3(startPos.position.x, startPos.position.y, startPos.position.z), Quaternion.Euler(0, 0, 0));
                     obj.transform.parent = FuJianParent.transform;
+                    obj.transform.localEulerAngles = new Vector3(0f, -180f, 0f);
                     obj.name = "ResultView" + inspectList.taskList[i].GetComponent<InspectList_Button>().text_num.text;
                     obj.GetComponent<inspectResultList_Button>().SetText_ID(inspectList.taskList[i].GetComponent<InspectList_Button>().text_num.text);
                     obj.GetComponent<inspectResultList_Button>().SetText_Tag(inspectList.taskList[i].GetComponent<InspectList_Button>().text_name.text);
@@ -115,6 +116,7 @@ public class InspectSettlementPanel : MonoBehaviour
                     startPos = ResultViewListParent_PeiZhi.Find(inspectList.taskList[i].GetComponent<InspectList_Button>().endResultViewPos).gameObject.transform;
                     GameObject obj = Instantiate(resultView, new Vector3(startPos.position.x, startPos.position.y, startPos.position.z), Quaternion.Euler(0, 0, 0));
                     obj.transform.parent = PeiZhiParent.transform;
+                    obj.transform.localEulerAngles = new Vector3(0f, -180f, 0f);
                     obj.name = "ResultView" + inspectList.taskList[i].GetComponent<InspectList_Button>().text_num.text;
                     obj.GetComponent<inspectResultList_Button>().SetText_ID(inspectList.taskList[i].GetComponent<InspectList_Button>().text_num.text);
                     obj.GetComponent<inspectResultList_Button>().SetText_Tag(inspectList.taskList[i].GetComponent<InspectList_Button>().text_name.text);

Assets/Scripts/MainDargGames/QHCControl.cs

@@ -22,6 +22,7 @@ public class QHCControl : MonoBehaviour
     void Start()
     {
         mesh_script = BrockObj.GetComponent<MeshSequencePlayer>();
+        BrockObj.SetActive(false);
 
         m_Button.onDown.AddListener(OnButtonDown);
     }

Assets/TestGongYe/GongYeContral.cs

@@ -1,117 +1,69 @@
 using CCS.App;
-using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
 using UnityEngine;
+using LitJson;
 
 public class GongYeContral : MonoBehaviour
 {
-    /// <summary>
-    /// 功能状态发生变化
-    /// </summary>
-    public Action<int, int, FunctionType, List<FunctionValue>> functionChangleAction;
-
-
-    public List<FunctionInfo> functionInfos;
-    private ModuleFunctionData _moduleFunctionData;
-    private List<ModuleInfo> _moduleInfos;
-    public List<ModuleInfo> moduleInfos
+    private GongYeData m_GongYeData;
+    private List<FunctionValue> m_FunctionValues;
+    public List<FunctionValue> FunctionValues
     {
-        get { return _moduleInfos; }
-    }
-
-
-
-    public ModuleFunctionData ModuleFunctionData { get => _moduleFunctionData; }
-
-
-
-
-    private void Start()
-    {
-        _moduleFunctionData = JsonUtility.FromJson<ModuleFunctionData>(((Resources.Load("config/modulefunction")) as TextAsset).text);
-        _moduleFunctionData.modules.Sort(ModuleComparison);
-        _moduleInfos = _moduleFunctionData.modules.FindAll(m => m.moduleOpen == true);
-        for (int i = 0, count = _moduleInfos.Count; i < count; i++)
-        {
-            functionInfos.AddRange(_moduleInfos[i].functions.FindAll(f => f.isOpen == true));
-        }
-        List<FunctionInfo> tempFunctionInfos = functionInfos.FindAll(f => f.functionType == FunctionType.GotoScence || f.functionType == FunctionType.Switch || f.functionType == FunctionType.RangeValue);
-        for (int i = 0, count = tempFunctionInfos.Count; i < count; i++)
-        {
-            tempFunctionInfos[i].functionValues = new List<FunctionValue>();
-            FunctionValue fv = new FunctionValue();
-            fv.index = 0;
-            fv.isShow = true;
-            fv.value = tempFunctionInfos[i].defaultValue;
-            tempFunctionInfos[i].functionValues.Add(fv);
-        }
-        List<FunctionInfo> flowFunctionInfos = functionInfos.FindAll(f => f.functionType == FunctionType.FlowValue);
-        for (int i = 0, count = flowFunctionInfos.Count; i < count; i++)
+        get
         {
-            StepContentInfo sci = ModuleFunctionData.stepContentInfos.Find(f => f.moduleID == flowFunctionInfos[i].moduleID && f.functionID == flowFunctionInfos[i].functionID);
-            if (sci != null)
+            if (null == m_FunctionValues)
             {
-                List<FunctionValue> fvList = new List<FunctionValue>();
-                for (int j = 0, sciCount = sci.contentInfos.Count; j < sciCount; j++)
-                {
-                    FunctionValue fv = new FunctionValue();
-                    fv.index = j;
-                    fv.isShow = fv.index == flowFunctionInfos[i].defaultValue ? true : false;
-                    fv.value = 0;
-                    fvList.Add(fv);
-                }
-                flowFunctionInfos[i].functionValues = fvList;
+                m_FunctionValues = m_GongYeData.functionValues;
             }
+            return m_FunctionValues;
         }
+        set { m_FunctionValues = value; }
     }
 
-    public List<FunctionValue> GetFunctionValues(List<FunctionValue> functionValues)
+    void Start()
     {
-        List<FunctionValue> fvs = new List<FunctionValue>();
-        for (int i = 0, count = functionValues.Count; i < count; i++)
-        {
-            FunctionValue fv = Clone<FunctionValue>(functionValues[i]);
-            fvs.Add(fv);
-        }
-        return fvs;
+        GetData();
     }
 
-
-    public T Clone<T>(T RealObject)
+    // Update is called once per frame
+    void Update()
     {
 
-        using (Stream objectStream = new MemoryStream())
-        {
-            //利用 System.Runtime.Serialization序列化与反序列化完成引用对象的复制
-
-            IFormatter formatter = new BinaryFormatter();
-
-            formatter.Serialize(objectStream, RealObject);
-
-            objectStream.Seek(0, System.IO.SeekOrigin.Begin);
-
-            return (T)formatter.Deserialize(objectStream);
-
-        }
-
     }
 
-
-    private int ModuleComparison( ModuleInfo a, ModuleInfo b)
+    /// <summary>
+    /// 获取工业步骤内容信息
+    /// </summary>
+    private void GetData()
     {
-        if (a.sortWeight > b.sortWeight)
-            return 1;
-        else if (a.sortWeight < b.sortWeight)
-            return -1;
-        if (a.moduleID > b.moduleID)
-            return 1;
-        else if (a.moduleID < b.moduleID)
-            return -1;
-        return 0;
+        while (true)
+        {
+            m_GongYeData = JsonMapper.ToObject<GongYeData>(((Resources.Load("config/gongyedata")) as TextAsset).text);
+            if (m_GongYeData != null)
+            {
+                break;
+            }
+        }
+        List<FunctionValue> fvList = new List<FunctionValue>();
+        for (int i = 0; i < m_GongYeData.contentInfos.Count; i++)
+        {
+            FunctionValue fv = new FunctionValue();
+            fv.index = i;
+            fv.isShow = fv.index == m_GongYeData.defaultValue ? true : false;
+            fv.value = 0;
+            fvList.Add(fv);
+        }
+        m_GongYeData.functionValues = fvList;
     }
+}
 
+public class GongYeData
+{
+    public uint moduleID;
+    public uint functionID;
+    public int defaultValue;// 默认值
+    public int isShowState;
+    public List<FunctionValue> functionValues;
+    public List<ContentInfo> contentInfos;
 }
+