diff --git a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab index 5c90de3..96bc3ee 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab @@ -1362,7 +1362,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 60, y: 60} + m_SizeDelta: {x: 96, y: 112} m_Pivot: {x: 0, y: 1} --- !u!222 &2691561617286440876 CanvasRenderer: @@ -1392,7 +1392,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8e0eee580e2f34745bee35300cec56e3, type: 3} + m_Sprite: {fileID: 21300000, guid: 922abcf0d8d485b499c228594726808e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1431,10 +1431,10 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: 114c023798da0cd499e2aaa07d1f384f, type: 3} - m_PressedSprite: {fileID: 21300000, guid: 114c023798da0cd499e2aaa07d1f384f, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: d9af24a5365a6424984c5ffacbeb6b08, type: 3} + m_PressedSprite: {fileID: 21300000, guid: d9af24a5365a6424984c5ffacbeb6b08, type: 3} m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 21300000, guid: 9666a28123017a749af80e241d5e7f2c, type: 3} + m_DisabledSprite: {fileID: 21300000, guid: 922abcf0d8d485b499c228594726808e, type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -2000,7 +2000,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u6545\u969C\u8BB0\u5F55\u8868" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2} m_sharedMaterial: {fileID: 4239875615288461448, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2} diff --git a/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs b/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs index a810af7..396e66e 100644 --- a/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs +++ b/Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs @@ -53,7 +53,7 @@ public class NPC_Attach10002_2002 : NPC_Attach_Base { panel.Init(custom.triggerName, "拿取工具。", "指导老师", 0, (intTemp) => { - List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "剥线钳", "绝缘螺丝刀" }); + List items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List { "放大镜","剪刀","解剖刀","镊子" }); items2.ForEach(item => { PacksackBagMgr.Instance.AddOneToolOrMater(item); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs index 457e07b..608a0d7 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs @@ -167,7 +167,8 @@ public class UI_MenuBar : BasePanel //关闭告知单按钮 notifyBtn.gameObject.SetActive(false);//notifyBtn.gameObject.SetActive(type == E_SceneType.Site); int t = GameManager.DataMgr.d_System.subjects.Find(subject => subject.id == GameManager.RunModelMgr.schemeID).isFault; - faultRegBtn.gameObject.SetActive(false);//.SetActive(type == E_SceneType.Site && GameManager.DataMgr.d_System.subjects.Find(subject => subject.id == GameManager.RunModelMgr.schemeID).isFault == 1); + //打开PPT按钮 + faultRegBtn.gameObject.SetActive(true);//.SetActive(type == E_SceneType.Site && GameManager.DataMgr.d_System.subjects.Find(subject => subject.id == GameManager.RunModelMgr.schemeID).isFault == 1); } @@ -328,14 +329,25 @@ public class UI_MenuBar : BasePanel }); } break; - case "FaultRegBtn": - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(faultRegName, false) == 0) + case "FaultRegBtn"://代替PPT + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid); + GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { - GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (p) => + GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => { - p.Init(faultRegName); + Debug.Log("加载理论学习面板"); + //GameManager.UIMgr.HidePanel(); + GameManager.UIMgr.HidePanel(); }); - } + + }); + //if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(faultRegName, false) == 0) + //{ + // GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (p) => + // { + // p.Init(faultRegName); + // }); + //} break; case "InspectionRecordFormBtn": if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(inspectionRecordFormName, false) == 0) diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs index 6bb8f45..d784f95 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs @@ -76,15 +76,26 @@ public class UI_PPTForPracticePanel : BasePanel switch (btnName) { case "retrun_Btn": - GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => + if (GameManager.RunModelMgr.SceneType != E_SceneType.Site) { - GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => + GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { - Debug.Log(".1"); - GameManager.UIMgr.HidePanel(); - GameManager.UIMgr.HidePanel(); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => + { + Debug.Log(".1"); + GameManager.UIMgr.HidePanel(); + GameManager.UIMgr.HidePanel(); + }); }); - }); + } + else + { + GameManager.UIMgr.HidePanel(); + if (GameManager.UIMgr.GetPanel() != null) + { + GameManager.UIMgr.HidePanel(); + } + } //Bootstrap.Instance.uiManager.HidePanel(); break; diff --git a/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml b/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml index 0b125d4..3f9ee64 100644 --- a/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml +++ b/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml @@ -1,63 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file diff --git a/Assets/StreamingAssets/Setting/绉戠洰/10002/10002_2002_璁￠噺瑁呯疆杞崲.xml b/Assets/StreamingAssets/Setting/绉戠洰/10002/10002_2002_璁￠噺瑁呯疆杞崲.xml index 2fbf419..2c4b4ad 100644 --- a/Assets/StreamingAssets/Setting/绉戠洰/10002/10002_2002_璁￠噺瑁呯疆杞崲.xml +++ b/Assets/StreamingAssets/Setting/绉戠洰/10002/10002_2002_璁￠噺瑁呯疆杞崲.xml @@ -1,7 +1,7 @@ - +