diff --git a/Assets/Art/UIPrefab/UIInstruction.prefab b/Assets/Art/UIPrefab/UIInstruction.prefab index 7ccc214f..e36e68ff 100644 --- a/Assets/Art/UIPrefab/UIInstruction.prefab +++ b/Assets/Art/UIPrefab/UIInstruction.prefab @@ -244,7 +244,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u4E0D\u5728\u5F39\u51FA" + m_text: "\u4E0D\u518D\u5F39\u51FA" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: e7da174c677019b49aa681250aa4ded8, type: 2} m_sharedMaterial: {fileID: -7878122246201655599, guid: e7da174c677019b49aa681250aa4ded8, type: 2} diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index 2039e33e..8c4b6591 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -18919,6 +18919,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -89.41855 objectReference: {fileID: 0} + - target: {fileID: -1951551135180038253, guid: ee8540f1864b2e44d858716470022203, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: ee8540f1864b2e44d858716470022203, type: 3} propertyPath: m_Name value: shoutao @@ -18935,6 +18939,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -69.042816 objectReference: {fileID: 0} + - target: {fileID: 5040873534929097433, guid: ee8540f1864b2e44d858716470022203, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7194333132219803092, guid: ee8540f1864b2e44d858716470022203, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -26926,6 +26934,10 @@ PrefabInstance: propertyPath: TValue value: 1 objectReference: {fileID: 0} + - target: {fileID: 2999783213077156870, guid: e1761819aac3ed74682aa8337a23d32e, type: 3} + propertyPath: FurLength + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5853507596174565926, guid: e1761819aac3ed74682aa8337a23d32e, type: 3} propertyPath: m_Name value: TiMao @@ -36486,6 +36498,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 738442634} m_Modifications: + - target: {fileID: 508545309650984612, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 08b25335e6ce3bd4eacb9f61a422e5d3, type: 2} + - target: {fileID: 1063729919534690453, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 08b25335e6ce3bd4eacb9f61a422e5d3, type: 2} + - target: {fileID: 1459648085832866371, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: 08b25335e6ce3bd4eacb9f61a422e5d3, type: 2} - target: {fileID: 1674020468358471734, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -36498,6 +36522,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4001827875320848872, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4216720329452924925, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} propertyPath: m_IsActive value: 1 @@ -36558,6 +36586,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 7870991500688896444, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8062820705549542384, guid: 4dde43b36ab78d04da783fc679db9abb, type: 3} propertyPath: m_Materials.Array.data[0] value: @@ -37033,6 +37065,10 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: 40e64238025751b478bc18593885b205, type: 2} + - target: {fileID: 6779638375175544537, guid: b37fe5a61d9e1c843b6a25cb5287f8a6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 21ea76e9..adb7bd86 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -595,9 +595,10 @@ 麻醉注射器 - Models/Aim_ZSQ/SM_ZhSheQI_20/pasted__polySurface6 - + Models/MaZui_Aim_zhusheqi + + 洗手间相机位置点1 @@ -627,7 +628,7 @@ 插管 - Models/Aim_chaguan/SM_qiguan + Models/MaZui_Aim_chaguan/SM_qiguan 插管 @@ -819,7 +820,6 @@ - @@ -885,8 +885,8 @@ + - @@ -897,7 +897,6 @@ - @@ -1018,7 +1017,8 @@ - + + @@ -1032,9 +1032,6 @@ - - - @@ -1096,7 +1093,6 @@ - @@ -1181,6 +1177,7 @@ + @@ -1222,7 +1219,8 @@ - + + @@ -1236,9 +1234,6 @@ - - - @@ -1413,7 +1408,6 @@ - @@ -1427,17 +1421,6 @@ - - - - - - - - - - - @@ -1464,7 +1447,6 @@ - @@ -1498,83 +1480,118 @@ - - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + - - + + + + - - - - - + + - - + + - + - - - - - + + + + - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + @@ -1582,11 +1599,13 @@ - + + + - + @@ -1594,21 +1613,9 @@ - - - - - - - - - - - - + + +