diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index 1e88a1b..02752e8 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 667033d..649c5ac 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -5398,7 +5398,7 @@ "CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0", "CameraNearTR2": "", "QNextNum": 212, - "ExamModelBT": "InInjectionPoint_sign|OutInjectionPoint_sign", + "ExamModelBT": "InPTYZInjectionPoint_sign|OutPTYZInjectionPoint_sign", "ExamTip": "请选择送胚的位置", "ExamEvvr": "选择错误", "Question": "", @@ -6048,7 +6048,7 @@ "CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0", "CameraNearTR2": "", "QNextNum": 235, - "ExamModelBT": "", + "ExamModelBT": "InYYZDInjectionPoint_sign|OutYYZDInjectionPoint_sign", "ExamTip": "请选择检查时正确的抓捏位置", "ExamEvvr": "选择错误", "Question": "", diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 90f96b9..0544dc3 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -1324,6 +1324,106 @@ SkinnedMeshRenderer: m_Center: {x: -0.0005427159, y: 0.0006174468, z: -0.000031717384} m_Extent: {x: 0.0016494812, y: 0.0009938634, z: 0.00046383587} m_DirtyAABB: 0 +--- !u!1001 &91775659 +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: InYYZDInjectionPoint_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.054261383 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.054261398 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.054261386 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.072 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.3692 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.9635 + 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: 0.9505939 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.31043732 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -36.171 + 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 &91775660 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 91775659} + m_PrefabAsset: {fileID: 0} +--- !u!1 &91775661 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 91775659} + m_PrefabAsset: {fileID: 0} --- !u!43 &93143743 Mesh: m_ObjectHideFlags: 0 @@ -1946,6 +2046,106 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1001 &118906504 +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: OutYYZDInjectionPoint_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.054261383 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.054261398 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.054261386 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.133 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.3127 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.033 + 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 &118906505 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 118906504} + m_PrefabAsset: {fileID: 0} +--- !u!1 &118906506 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 118906504} + m_PrefabAsset: {fileID: 0} --- !u!1 &119597086 GameObject: m_ObjectHideFlags: 0 @@ -17890,6 +18090,10 @@ MonoBehaviour: - {fileID: 177160283} - {fileID: 694871478} - {fileID: 1160721213} + - {fileID: 1774391733} + - {fileID: 1594487690} + - {fileID: 91775661} + - {fileID: 118906506} - {fileID: 592790579} - {fileID: 2131020004} - {fileID: 1469586053} @@ -17960,7 +18164,7 @@ PlayableDirector: m_GameObject: {fileID: 909784101} m_Enabled: 1 serializedVersion: 3 - m_PlayableAsset: {fileID: 11400000, guid: 7bff6f14e388dd74dad4e09245b4dc6f, type: 2} + m_PlayableAsset: {fileID: 11400000, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} m_InitialState: 0 m_WrapMode: 2 m_DirectorUpdateMode: 1 @@ -18586,6 +18790,8 @@ PlayableDirector: value: {fileID: 0} - key: {fileID: -2107658062037402844, guid: 2134e73ea8d9bad4fb4b8cd512a92976, type: 2} value: {fileID: 0} + - key: {fileID: 8025115912847834868, guid: 6acea7bd7fc40ec45b3f84dbc855296c, type: 2} + value: {fileID: 0} m_ExposedReferences: m_References: - 335a0b1c4f8ab3e4a9c25efaa7f82a49: {fileID: 567124863} @@ -32026,6 +32232,106 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.044757977, y: 0.016162015, z: 0.58460647} m_Center: {x: -0.01626284, y: 0.0023102416, z: 0.02133464} +--- !u!1001 &1594487688 +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: OutPTYZInjectionPoint_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.054261383 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.054261398 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.054261386 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.133 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.3127 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.033 + 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 &1594487689 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1594487688} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1594487690 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1594487688} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1596529454 PrefabInstance: m_ObjectHideFlags: 0 @@ -34501,6 +34807,106 @@ Transform: - {fileID: 1622512093} m_Father: {fileID: 1128512908} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1774391731 +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: InPTYZInjectionPoint_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.054261383 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.054261398 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.054261386 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.072 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.3692 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.9635 + 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: 0.9505939 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.31043732 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -36.171 + 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 &1774391732 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1774391731} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1774391733 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1774391731} + m_PrefabAsset: {fileID: 0} --- !u!1 &1779749777 GameObject: m_ObjectHideFlags: 0 @@ -38590,6 +38996,10 @@ Transform: - {fileID: 177160282} - {fileID: 694871477} - {fileID: 1160721212} + - {fileID: 1774391732} + - {fileID: 1594487689} + - {fileID: 91775660} + - {fileID: 118906505} - {fileID: 1259265029} - {fileID: 1817313826} - {fileID: 966611076}