diff --git a/Assets/_Scenes/TrainExam.unity b/Assets/_Scenes/TrainExam.unity index 3570668..f3dfed9 100644 --- a/Assets/_Scenes/TrainExam.unity +++ b/Assets/_Scenes/TrainExam.unity @@ -20558,6 +20558,7 @@ MonoBehaviour: _CPTran: {fileID: 1865600646} _YYZDTran: {fileID: 414910239} _PTYZTran: {fileID: 1422586371} + _PYXZTran: {fileID: 897551305} _isNearCameraTR: 0 _IsPlayAnm: 0 --- !u!4 &909784103 diff --git a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs index 49ae750..7e51e08 100644 --- a/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs +++ b/Assets/_Scripts/Application/SceneCtrls/NiuSceneMng.cs @@ -64,6 +64,8 @@ namespace ZXK.LouDiXvMuNiu private Transform _YYZDTran = null; [SerializeField] private Transform _PTYZTran = null; + [SerializeField] + private Transform _PYXZTran = null; private KinematicCharacterMotor kinematic = null; @@ -259,82 +261,7 @@ namespace ZXK.LouDiXvMuNiu if (curObj.TaskName != previousObj.TaskName) { InitFirstState(); - if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_TQFAQCL)) - { - GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); - jiaziGeo.transform.localPosition = new Vector3(-0.3f, 0.5998f, 2.47f); - jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); - - _TQFQTran.Find("SM_Niu_CaShi_an01").gameObject.SetActive(true); - } - else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CSPLCL)) - { - GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); - jiaziGeo.transform.localPosition = new Vector3(-0.3f, 0.5998f, 0.157f); - jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); - - GameObject boziGeo = _CSPLTran.Find("SM_Niu_ZhusheB_Bozi_an_B01(2)").gameObject; - boziGeo.SetActive(true); - boziGeo.transform.Find("Yisheng_ok:Doctor").gameObject.SetActive(false); - boziGeo.transform.Find("SM_XiaoTuiChe_Zhusheqi").gameObject.SetActive(false); - } - else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_JZLVJC)) - { - - } - else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_RGSJ)) - { - GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); - jiaziGeo.transform.localPosition = new Vector3(-0.485f, 0.5997721f, 2.109f); - jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); - GameObject gjj2Geo = UtilitiesMng.GetGeoByName(_toolContain, "工具架2", true); - gjj2Geo.gameObject.SetActive(true); - _RGSJTran.Find("SM_Niu_RenGongSouJing01").gameObject.SetActive(true); - } - else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP)) - { - GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); - jiaziGeo.transform.localPosition = new Vector3(-0.81f, 0.632f, 2.883f); - jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.up * -180.0f); - - Transform toolTemp = jiaziGeo.transform.Find("冲卵管"); - //foreach (Transform item in toolTemp) - //{ - // item.gameObject.SetActive(true); - //} - if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) - {//如果训练模式下，物品展示时显示物品 - if (curObj.ThreeTaskName == ConstCtrl.ThreeTaskName_PrepareGeo) - { - foreach (Transform item in toolTemp) - { - item.gameObject.SetActive(true); - } - } - } - - _CPTran.Find("SM_Doctor").gameObject.SetActive(true); - _CPTran.Find("SM_Niu_ChongPei01").gameObject.SetActive(true); - _CPTran.Find("SM_Niu_ChongPei").gameObject.SetActive(true); - } - else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ)) - { - } - else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTYZ)) - { - GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); - jiaziGeo.transform.localPosition = new Vector3(-0.485f, 0.5997721f, 2.109f); - jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); - _PTYZTran.Find("SM_PeiTaiYiZhi03").gameObject.SetActive(true); - } - else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD)) - { - GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); - jiaziGeo.transform.localPosition = new Vector3(-0.81f, 0.632f, 2.883f); - jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.up * -180.0f); - - _YYZDTran.Find("niu_yindaojiancha").gameObject.SetActive(true); - } + InitItemState(curObj, previousObj); } if (curObj.ThreeTaskName != previousObj.ThreeTaskName) { @@ -471,6 +398,88 @@ namespace ZXK.LouDiXvMuNiu } } } + + public void InitItemState(NiuData curObj, NiuData previousObj) + { + if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_TQFAQCL)) + { + GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); + jiaziGeo.transform.localPosition = new Vector3(-0.3f, 0.5998f, 2.47f); + jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); + + _TQFQTran.Find("SM_Niu_CaShi_an01").gameObject.SetActive(true); + } + else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CSPLCL)) + { + GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); + jiaziGeo.transform.localPosition = new Vector3(-0.3f, 0.5998f, 0.157f); + jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); + + GameObject boziGeo = _CSPLTran.Find("SM_Niu_ZhusheB_Bozi_an_B01(2)").gameObject; + boziGeo.SetActive(true); + boziGeo.transform.Find("Yisheng_ok:Doctor").gameObject.SetActive(false); + boziGeo.transform.Find("SM_XiaoTuiChe_Zhusheqi").gameObject.SetActive(false); + } + else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_JZLVJC)) + { + } + else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_RGSJ)) + { + GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); + jiaziGeo.transform.localPosition = new Vector3(-0.485f, 0.5997721f, 2.109f); + jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); + GameObject gjj2Geo = UtilitiesMng.GetGeoByName(_toolContain, "工具架2", true); + gjj2Geo.gameObject.SetActive(true); + _RGSJTran.Find("SM_Niu_RenGongSouJing01").gameObject.SetActive(true); + } + else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_CP)) + { + GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); + jiaziGeo.transform.localPosition = new Vector3(-0.81f, 0.632f, 2.883f); + jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.up * -180.0f); + + Transform toolTemp = jiaziGeo.transform.Find("冲卵管"); + //foreach (Transform item in toolTemp) + //{ + // item.gameObject.SetActive(true); + //} + if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) + {//如果训练模式下，物品展示时显示物品 + if (curObj.ThreeTaskName == ConstCtrl.ThreeTaskName_PrepareGeo) + { + foreach (Transform item in toolTemp) + { + item.gameObject.SetActive(true); + } + } + } + + _CPTran.Find("SM_Doctor").gameObject.SetActive(true); + _CPTran.Find("SM_Niu_ChongPei01").gameObject.SetActive(true); + _CPTran.Find("SM_Niu_ChongPei").gameObject.SetActive(true); + } + else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTXZ)) + { + _PYXZTran.Find("Canvas/TogGroup/PTXZVideoPlay").gameObject.SetActive(false); + _PYXZTran.Find("Canvas/TogGroup/PTXZVideoPlay (1)").gameObject.SetActive(false); + _PYXZTran.Find("Canvas/TogGroup/PTXZVideoPlay (2)").gameObject.SetActive(false); + } + else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_PTYZ)) + { + GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); + jiaziGeo.transform.localPosition = new Vector3(-0.485f, 0.5997721f, 2.109f); + jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.zero); + _PTYZTran.Find("SM_PeiTaiYiZhi03").gameObject.SetActive(true); + } + else if (GameManager.Instance._CurModelType.Equals(ConstCtrl.ModuleName_YYZD)) + { + GameObject jiaziGeo = UtilitiesMng.GetGeoByName(_toolContain, "M_Jiazi_b", true); + jiaziGeo.transform.localPosition = new Vector3(-0.81f, 0.632f, 2.883f); + jiaziGeo.transform.localRotation = Quaternion.Euler(Vector3.up * -180.0f); + + _YYZDTran.Find("niu_yindaojiancha").gameObject.SetActive(true); + } + } /// /// 根据不同任务名称切换动画控制器 /// diff --git a/Assets/_Scripts/Application/UI/OperationStepPanel.cs b/Assets/_Scripts/Application/UI/OperationStepPanel.cs index b2421bf..27a4254 100644 --- a/Assets/_Scripts/Application/UI/OperationStepPanel.cs +++ b/Assets/_Scripts/Application/UI/OperationStepPanel.cs @@ -396,6 +396,7 @@ namespace ZXK.LouDiXvMuNiu if (NiuSceneMng._Instance._CurSceneStep != obj) {//区分是否是点击UI，直接进行的步骤跳转 NiuSceneMng._Instance.JumpTimeline(obj, true); + NiuSceneMng._Instance.InitItemState(obj, GameManager.Instance._DataNiuHandler.CurNiuHandler.PreviousValue); } if (GameManager.Instance._StateContext.GetState().Name.Equals("TrainState")) { diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d6e22e4..9c87e12 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,10 +27,10 @@ EditorUserSettings: value: 06050d525c050d0c5559597640220d4417164c7f757a20632c7c4d67bbb4326b flags: 0 RecentlyUsedSceneGuid-7: - value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d + value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a flags: 0 RecentlyUsedSceneGuid-8: - value: 51005757520559085f080f7b45750f444e4f1a297f2c24657f7d1b60e7b2326a + value: 5a08575f5207595a0f5d59741173094444164f7d7d2a23317c7a4465bbe1646d flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd3c3e302a07a37e0901373ae01e0008f707250d171df81a53a5405d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fdaee1e1928b86d888ed909c968797a7cf diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index dc02fbf..af9bf1c 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -26,7 +26,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 30026 + controlID: 4734 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 30027 + controlID: 4735 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -639,9 +639,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.24581538, y: -2.3482363, z: 0.8596947} + m_Target: {x: 1.1203884, y: -2.4140167, z: 2.018311} speed: 2 - m_Value: {x: -0.24581538, y: -2.3482363, z: 0.8596947} + m_Value: {x: 1.1203884, y: -2.4140167, z: 2.018311} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -687,13 +687,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.2956594, y: -0.031220855, z: 0.00966871, w: 0.9547379} + m_Target: {x: 0.17461374, y: -0.05726064, z: 0.0101775015, w: 0.98294526} speed: 2 - m_Value: {x: -0.29565942, y: 0.031220855, z: -0.009668711, w: -0.95473796} + m_Value: {x: 0.17460907, y: -0.057259105, z: 0.010177229, w: 0.9829189} m_Size: - m_Target: 0.38705772 + m_Target: 0.123163916 speed: 2 - m_Value: 0.38705772 + m_Value: 0.123163916 m_Ortho: m_Target: 0 speed: 2 @@ -881,8 +881,8 @@ MonoBehaviour: y: 0 width: 354 height: 939 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} @@ -926,9 +926,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9083e1ff - m_LastClickedID: -1997936 - m_ExpandedIDs: 0487e1ff34cde2ff1a44e3ffb2b6e3ff225be4ff8ebfe4ff4623e5ffbe87e5ff0c0de6ff709fe6ff2683e7ff96e9e7ffac50e8ffc6bde8ffd4c2e8ff9627e9ff9628e9ff508de9ff7af1e9ff1857eaffe0beeaff2225ebffda88ebffd4edebff8c51ecff5662ecff8063ecff1ac0ecff441fedffc42dedff9835edff1e3aedff203aedff2a3aedff2c3aedff2e3aedff303aedff9c3aedff9e3aedffa23aedffce3aedffd23aedff1a9cedff0ec4edff12c4edff6cc4edff6ec4edff78c4edff7ac4edff7cc4edff7ec4edffeac4edffecc4edfff0c4edff1cc5edff20c5edff3607eeff306deeffaed2eeff3e58efff5679efff72f1efff625cf0fffe5cf0ff085df0ff0061f0ff0c61f0ff2061f0ff2a3ff2ffc63ff2ffd03ff2ffc843f2ffd443f2ffe843f2ff1eacf2ffd20ff3ff2684f3ff00ebf3ff625ef4ff6edff4ff72dff4ffe8dff4ff04e0f4ff08e0f4ff0ce0f4ff7ce0f4ff80e0f4ff84e0f4ffb0e0f4ffb4e0f4ffa2eef4ffc8fdf4ffccfdf4ffdcfef4ff2e00f5ff3200f5ff225ef5ff50d5f5ff7e8df6ff828df6ffae8df6ffb28df6ffb68df6ffba8df6fffa8df6fffe8df6ff128ef6ff168ef6ff1a8ef6ff1e8ef6ff8e8ef6ff928ef6ff968ef6ffc28ef6ffc68ef6ff16aaf6ff7651f9ff70f2ffff2efbfffff4ffffff227800003a780000a82a03004a2f0300d2300300b8310300a8330300c6370300ecb30300eab7030072b8030014be0300fabe0300eac0030008c503009ec5030016ca0300a8ce0300a6d20300d0d80300b6d90300ce3d040000440400e644040000870400208704000c5f05006c640500dc650500246605005aaf05006cb805008abc050020bd05008ae0050088e40500baea0500a0eb050022fb050036ff05007205060058060600721a0600942106007a330600ec330600b6350600c83e0600e64206007c4306003e6b06004674060064780600fa7806005aa006005ca9060062a9060080ad060016ae0600f4ba060000c4060006c4060024c80600bac806001cf0060024f9060042fd0600d8fd0600b20a0700c4130700e2170700781807003c250700442e070062320700f83207002240070034490700524d0700e84d0700765b07001e6407008264070088640700a66807003c69070000760700027f0700087f070026830700bc8307009e900700b0990700ce9d0700649e0700a8fc070012020800ca030800e24508002c020a004c020a00 + m_SelectedIDs: d27b0000 + m_LastClickedID: 0 + m_ExpandedIDs: 366cfdfff0d0fdfff2d5fdff844afeffa0bbfeffb22effff0434ffffca52ffff6669ffff0c8bffffe4dbffff00f8ffff2efbffff4e81000052810000848400002c85000014880000a88b0000c8440100f24401001a450100c4470100464c010096820100c0820100e882010092850100148a0100a29e0100cea50100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -969,7 +969,7 @@ MonoBehaviour: serializedVersion: 2 x: 1198 y: 0 - width: 100 + width: 279 height: 939 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -1001,7 +1001,7 @@ MonoBehaviour: serializedVersion: 2 x: 1198 y: 73 - width: 98 + width: 277 height: 918 m_SerializedDataModeController: m_DataMode: 0 @@ -1041,7 +1041,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 5e780000 m_LastClickedID: 30814 - m_ExpandedIDs: ffffffff000000008478000086780000887800008a7800008c7800008e78000090780000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c6780000c8780000cc780000ce780000d0780000d2780000d6780000d8780000ee7b00001c83020088450300 + m_ExpandedIDs: ffffffff0000000086780000887800008a7800008c7800008e780000907800009278000094780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000da7b0000dc7b0000fa7b0000e80401001c6001001e600100 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1067,23 +1067,23 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9083e1ff - m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000008478000086780000887800008a7800008c7800008e78000090780000927800009478000096780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c6780000c8780000cc780000ce780000d0780000d2780000d6780000d8780000ee7b00001c83020088450300 + m_SelectedIDs: d27b0000 + m_LastClickedID: 31698 + m_ExpandedIDs: ffffffff0000000086780000887800008a7800008c7800008e780000907800009278000094780000987800009a7800009c7800009e780000a0780000a2780000a4780000a6780000a8780000aa780000ac780000ae780000b0780000b2780000b4780000b6780000b8780000ba780000bc780000be780000c0780000c2780000c4780000c6780000c8780000ca780000cc780000ce780000d0780000d2780000d4780000d6780000d8780000da7b0000dc7b0000fa7b0000e80401001c6001001e600100 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: TrainExam + m_OriginalName: TrainExam m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 31702 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 11} m_SearchString: @@ -1094,8 +1094,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 9083e1ff - m_LastClickedInstanceID: -1997936 + m_SelectedInstanceIDs: d27b0000 + m_LastClickedInstanceID: 31698 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: m_RenameOverlay: @@ -1140,12 +1140,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1298 + x: 1477 y: 0 - width: 622 + width: 443 height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -1172,9 +1172,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1298 + x: 1477 y: 73 - width: 621 + width: 442 height: 918 m_SerializedDataModeController: m_DataMode: 0