diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index 9de866c..1e88a1b 100644 Binary files a/Assets/StreamingAssets/Excel/NiuData.xlsx and b/Assets/StreamingAssets/Excel/NiuData.xlsx differ diff --git a/Assets/StreamingAssets/ExcelJson/NiuData.txt b/Assets/StreamingAssets/ExcelJson/NiuData.txt index d632379..667033d 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -4150,7 +4150,7 @@ "CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0", "CameraNearTR2": "", "QNextNum": 161, - "ExamModelBT": "", + "ExamModelBT": "ZhuQiKouPoint_sign|ZhuYeKouPoint_sign|YeChuKouPoint_sign", "ExamTip": "请选择正确的注气口注气", "ExamEvvr": "选择错误", "Question": "", @@ -4176,7 +4176,7 @@ "CameraNearTR": "2.065317_-2.305965_1.770304|50.11497_180.34_0", "CameraNearTR2": "1.551287_-2.455041_0.7389933|1.494979_359.58_0", "QNextNum": 164, - "ExamModelBT": "", + "ExamModelBT": "ZhuYeKouPoint_sign|ZhuQiKouPoint_sign|YeChuKouPoint_sign", "ExamTip": "请选择正确的液入口注液", "ExamEvvr": "选择错误", "Question": "", @@ -4254,7 +4254,7 @@ "CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0", "CameraNearTR2": "", "QNextNum": 165, - "ExamModelBT": "", + "ExamModelBT": "YeChuKouPoint_sign|ZhuYeKouPoint_sign|ZhuQiKouPoint_sign", "ExamTip": "请选择正确的回收液出口", "ExamEvvr": "选择错误", "Question": "", diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index c635499..90f96b9 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -17894,6 +17894,9 @@ MonoBehaviour: - {fileID: 2131020004} - {fileID: 1469586053} - {fileID: 2005283388} + - {fileID: 1259265030} + - {fileID: 1817313827} + - {fileID: 966611077} _peoplePlanTimeLineClip: {fileID: 11400000, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} _CSPLCLTimeLineClip: {fileID: 11400000, guid: 66029414ec3d89b469ed349852ba3d92, @@ -17957,7 +17960,7 @@ PlayableDirector: m_GameObject: {fileID: 909784101} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 7bff6f14e388dd74dad4e09245b4dc6f, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -20088,6 +20091,106 @@ Transform: - {fileID: 1229238874} m_Father: {fileID: 1021249329} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &966611075 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1985453657} + m_Modifications: + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_Name + value: YeChuKouPoint_sign + objectReference: {fileID: 0} + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04564258 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.045642596 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.045642585 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.7066 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.404 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.04 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a623bdd0c9a05dd448dd9cc858aca9f1, type: 3} +--- !u!4 &966611076 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 966611075} + m_PrefabAsset: {fileID: 0} +--- !u!1 &966611077 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 966611075} + m_PrefabAsset: {fileID: 0} --- !u!1 &979919939 GameObject: m_ObjectHideFlags: 0 @@ -26414,6 +26517,106 @@ Mesh: offset: 0 size: 0 path: +--- !u!1001 &1259265028 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1985453657} + m_Modifications: + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_Name + value: ZhuQiKouPoint_sign + objectReference: {fileID: 0} + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04564258 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.045642596 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.045642585 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.7053 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.2718 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.04 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a623bdd0c9a05dd448dd9cc858aca9f1, type: 3} +--- !u!4 &1259265029 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1259265028} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1259265030 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1259265028} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1273240218 PrefabInstance: m_ObjectHideFlags: 0 @@ -35390,6 +35593,106 @@ SkinnedMeshRenderer: m_Center: {x: 0.28516603, y: 0.2910856, z: -0.1145253} m_Extent: {x: 0.9379022, y: 0.3518448, z: 0.53825194} m_DirtyAABB: 0 +--- !u!1001 &1817313825 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1985453657} + m_Modifications: + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_Name + value: ZhuYeKouPoint_sign + objectReference: {fileID: 0} + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04564258 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.045642596 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.045642585 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.7021 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.3159 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.04 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a623bdd0c9a05dd448dd9cc858aca9f1, type: 3} +--- !u!4 &1817313826 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1817313825} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1817313827 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1817313825} + m_PrefabAsset: {fileID: 0} --- !u!1 &1818172996 GameObject: m_ObjectHideFlags: 0 @@ -38287,6 +38590,9 @@ Transform: - {fileID: 177160282} - {fileID: 694871477} - {fileID: 1160721212} + - {fileID: 1259265029} + - {fileID: 1817313826} + - {fileID: 966611076} - {fileID: 1469586052} - {fileID: 2005283387} - {fileID: 2062834932}