diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index fd7dc11..ffa283a 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 6f55274..ae3425b 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -302,7 +302,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 14, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", @@ -1290,7 +1290,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 52, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", @@ -2434,7 +2434,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 96, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", @@ -2954,7 +2954,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 117, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", @@ -3890,7 +3890,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 153, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", @@ -4618,7 +4618,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 180, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", @@ -5060,7 +5060,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 197, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", @@ -5866,7 +5866,7 @@ "CameraNearTR": "", "CameraNearTR2": "", "QNextNum": 228, - "ExamModelBT": "", + "ExamModelBT": "Hand1_sign|Hand2_sign", "ExamTip": "请选择拿起手套时的捏拿位置", "ExamEvvr": "选择错误,应捏翻折部位", "Question": "", diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 2c9ba48..94ce752 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -11749,6 +11749,111 @@ Transform: m_Children: [] m_Father: {fileID: 1948173708} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &592790577 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1128055703} + m_Modifications: + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_Name + value: Hand1_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.05 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.139 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.90629995 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.6967 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.76994395 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.6381062 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.0017088662 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.0019739754 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 79.302 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.035 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.265 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a623bdd0c9a05dd448dd9cc858aca9f1, type: 3} +--- !u!4 &592790578 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 592790577} + m_PrefabAsset: {fileID: 0} +--- !u!1 &592790579 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 592790577} + m_PrefabAsset: {fileID: 0} --- !u!1 &600241879 GameObject: m_ObjectHideFlags: 0 @@ -17682,6 +17787,8 @@ MonoBehaviour: - {fileID: 1800198919} - {fileID: 694871478} - {fileID: 1160721213} + - {fileID: 592790579} + - {fileID: 2131020004} _peoplePlanTimeLineClip: {fileID: 11400000, guid: 650596eb2f54a364eaf5458ae2439d75, type: 2} _CSPLCLTimeLineClip: {fileID: 11400000, guid: 66029414ec3d89b469ed349852ba3d92, @@ -23889,6 +23996,8 @@ Transform: - {fileID: 2049531234} - {fileID: 928817548} - {fileID: 1152043226} + - {fileID: 592790578} + - {fileID: 2131020003} m_Father: {fileID: 909784103} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1128512907 @@ -40113,6 +40222,111 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a8f89d16b8b42c47949b574c2c0baaa, type: 3} +--- !u!1001 &2131020002 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1128055703} + m_Modifications: + - target: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_Name + value: Hand2_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.05 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.144 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9063 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.777 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.76994395 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.6381062 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.0017088662 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.0019739754 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 79.302 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.035 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.265 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a623bdd0c9a05dd448dd9cc858aca9f1, type: 3} +--- !u!4 &2131020003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 2131020002} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2131020004 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 2131020002} + m_PrefabAsset: {fileID: 0} --- !u!1 &4531841586939449 GameObject: m_ObjectHideFlags: 0