diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index 9405f08..216aa5b 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 b7ff57a..e2cafe6 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -952,7 +952,7 @@ "CameraNearTR": "1.551287_-2.455041_0.7389933|1.494979_359.58_0", "CameraNearTR2": "", "QNextNum": 38, - "ExamModelBT": "", + "ExamModelBT": "LuanCaoPoint_sign|ZiGongJiaoPoint_sign", "ExamTip": "请选择检查时正确的抓捏位置", "ExamEvvr": "选择错误", "Question": "", diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index c5d98f5..69ae4b6 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -3764,6 +3764,106 @@ Transform: - {fileID: 84601610} m_Father: {fileID: 1826626032} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &177160281 +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: LuanCaoPoint_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.06965249 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.06965251 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.0696525 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.1052 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.3952 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.9524 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.051054936 + 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.99869585 + 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: 174.147 + 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 &177160282 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 177160281} + m_PrefabAsset: {fileID: 0} +--- !u!1 &177160283 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 177160281} + m_PrefabAsset: {fileID: 0} --- !u!1 &177386150 GameObject: m_ObjectHideFlags: 0 @@ -17786,6 +17886,8 @@ MonoBehaviour: - {fileID: 587790280} - {fileID: 1608174069} - {fileID: 1800198919} + - {fileID: 1158455815} + - {fileID: 177160283} - {fileID: 694871478} - {fileID: 1160721213} - {fileID: 592790579} @@ -24416,6 +24518,106 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1001 &1158455813 +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: ZiGongJiaoPoint_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.06965249 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.06965251 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.0696525 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.1166 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.3128 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 2.0297 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.051054936 + 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.99869585 + 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: 174.147 + 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 &1158455814 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1158455813} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1158455815 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1158455813} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1160721211 PrefabInstance: m_ObjectHideFlags: 0 @@ -37163,7 +37365,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: b9fc5b63e91e94b41935b925ffc6c7b8, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8127618899566747444, guid: b9fc5b63e91e94b41935b925ffc6c7b8, type: 3} @@ -37975,6 +38177,8 @@ Transform: - {fileID: 587790279} - {fileID: 1608174068} - {fileID: 1800198918} + - {fileID: 1158455814} + - {fileID: 177160282} - {fileID: 694871477} - {fileID: 1160721212} - {fileID: 2062834932}