diff --git a/Assets/StreamingAssets/Excel/NiuData.xlsx b/Assets/StreamingAssets/Excel/NiuData.xlsx index ffa283a..9405f08 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 ae3425b..b7ff57a 100644 --- a/Assets/StreamingAssets/ExcelJson/NiuData.txt +++ b/Assets/StreamingAssets/ExcelJson/NiuData.txt @@ -500,7 +500,7 @@ "ThreeTaskName": "孕激素法", "TaskType": "动画", "ToolsName": "", - "ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|YinDaoPoint_sign", + "ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|TailInjectionPoint_sign", "Operation": "角色在牛脖子的位置,进行药物注射", "ProcessDescription": "将含有一定量孕激素的专用栓塞放入牛阴道内,10天左右取出阴道栓,同时肌注4mL氯前列烯醇", "SoundPath": "", @@ -1358,7 +1358,7 @@ "ThreeTaskName": "使用FSH进行超排", "TaskType": "动画", "ToolsName": "", - "ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|YinDaoPoint_sign", + "ModelBT": "NeckInjectionPoint_sign|BodyInjectionPoint_sign|TailInjectionPoint_sign", "Operation": "角色在牛脖子的位置,进行药物注射", "ProcessDescription": "在牛发情周期的9-13天之间的任意一天开始注射FSH", "SoundPath": "", diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 94ce752..c5d98f5 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -17784,6 +17784,7 @@ MonoBehaviour: - {fileID: 1385361293} - {fileID: 416603171} - {fileID: 587790280} + - {fileID: 1608174069} - {fileID: 1800198919} - {fileID: 694871478} - {fileID: 1160721213} @@ -31852,6 +31853,106 @@ Transform: - {fileID: 798656858} m_Father: {fileID: 1306836004} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1608174067 +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: TailInjectionPoint_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.11737668 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.y + value: 0.11737671 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalScale.z + value: 0.117376685 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.296 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.332 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.692 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.044211857 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.06255456 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.99687374 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.0193665 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -1.896 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -185.199 + objectReference: {fileID: 0} + - target: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 7.267 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a623bdd0c9a05dd448dd9cc858aca9f1, type: 3} +--- !u!4 &1608174068 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9056352827034250981, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1608174067} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1608174069 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265685189950564712, guid: a623bdd0c9a05dd448dd9cc858aca9f1, + type: 3} + m_PrefabInstance: {fileID: 1608174067} + m_PrefabAsset: {fileID: 0} --- !u!1 &1608547271 GameObject: m_ObjectHideFlags: 0 @@ -37062,7 +37163,7 @@ PrefabInstance: - target: {fileID: 919132149155446097, guid: b9fc5b63e91e94b41935b925ffc6c7b8, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8127618899566747444, guid: b9fc5b63e91e94b41935b925ffc6c7b8, type: 3} @@ -37872,6 +37973,7 @@ Transform: - {fileID: 1385361292} - {fileID: 416603170} - {fileID: 587790279} + - {fileID: 1608174068} - {fileID: 1800198918} - {fileID: 694871477} - {fileID: 1160721212} diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index 4b2f66d..6eac2b9 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -598,11 +598,17 @@ if(UnityEngine.EventSystems.EventSystem.current.IsPointerOverGameObject())return } if (tempBts[i].Contains("*")) { - _curStepUseBTDic.Add(false, toolTemp); + if (!_curStepUseBTDic.ContainsKey(false)) + { + _curStepUseBTDic.Add(false, toolTemp); + } } else { - _curStepUseBTDic.Add(true, toolTemp); + if (!_curStepUseBTDic.ContainsKey(true)) + { + _curStepUseBTDic.Add(true, toolTemp); + } } } }