taosuqi
/
CultivationOfBrewing-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

场景弹出PPT页面

This commit is contained in:
huqibin 2025-05-24 15:37:36 +08:00
parent ad0776a638
commit 3c0b5ca839
6 changed files with 47 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab
View File

@ -1362,7 +1362,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {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} m_Pivot: {x: 0, y: 1}
--- !u!222 &2691561617286440876 --- !u!222 &2691561617286440876
CanvasRenderer: CanvasRenderer:
@ -1392,7 +1392,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8e0eee580e2f34745bee35300cec56e3, type: 3} m_Sprite: {fileID: 21300000, guid: 922abcf0d8d485b499c228594726808e, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -1431,10 +1431,10 @@ MonoBehaviour:
m_ColorMultiplier: 1 m_ColorMultiplier: 1
m_FadeDuration: 0.1 m_FadeDuration: 0.1
m_SpriteState: m_SpriteState:
m_HighlightedSprite: {fileID: 21300000, guid: 114c023798da0cd499e2aaa07d1f384f, type: 3} m_HighlightedSprite: {fileID: 21300000, guid: d9af24a5365a6424984c5ffacbeb6b08, type: 3}
m_PressedSprite: {fileID: 21300000, guid: 114c023798da0cd499e2aaa07d1f384f, type: 3} m_PressedSprite: {fileID: 21300000, guid: d9af24a5365a6424984c5ffacbeb6b08, type: 3}
m_SelectedSprite: {fileID: 0} m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 21300000, guid: 9666a28123017a749af80e241d5e7f2c, type: 3} m_DisabledSprite: {fileID: 21300000, guid: 922abcf0d8d485b499c228594726808e, type: 3}
m_AnimationTriggers: m_AnimationTriggers:
m_NormalTrigger: Normal m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted m_HighlightedTrigger: Highlighted
@ -2000,7 +2000,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_text: "\u6545\u969C\u8BB0\u5F55\u8868" m_text:
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2} m_fontAsset: {fileID: 11400000, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2}
m_sharedMaterial: {fileID: 4239875615288461448, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2} m_sharedMaterial: {fileID: 4239875615288461448, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2}

2
Assets/Scripts/Project/Objects/Other/NPC_Attach10002_2002.cs
View File

@ -53,7 +53,7 @@ public class NPC_Attach10002_2002 : NPC_Attach_Base
{ {
panel.Init(custom.triggerName, "컬혤묏야。", "寧돔일可", 0, (intTemp) => panel.Init(custom.triggerName, "컬혤묏야。", "寧돔일可", 0, (intTemp) =>
{ {
List<ItemInfo> items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "괆窟풂", "없鍍쭁介독" }); List<ItemInfo> items2 = ToolAndmaterialMgr.Instance.CreateItemInfoByName(new List<string> { "放大镜","剪刀","解剖刀","镊子" });
items2.ForEach(item => items2.ForEach(item =>
{ {
PacksackBagMgr.Instance.AddOneToolOrMater(item); PacksackBagMgr.Instance.AddOneToolOrMater(item);

24
Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
View File

@ -167,7 +167,8 @@ public class UI_MenuBar : BasePanel
//¹Ø±Õ¸æÖªµ¥°´Å¥ //¹Ø±Õ¸æÖªµ¥°´Å¥
notifyBtn.gameObject.SetActive(false);//notifyBtn.gameObject.SetActive(type == E_SceneType.Site); 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; 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; break;
case "FaultRegBtn": case "FaultRegBtn"://代替PPT
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(faultRegName, false) == 0) GameManager.UIMgr.ShowPanel<UI_BGPanel>(E_UI_Layer.Mid);
GameManager.UIMgr.ShowPanel<UI_PPTForPracticePanel>(E_UI_Layer.System, (panel) =>
{ {
GameManager.UIMgr.ShowPanel<UI_FaultRegistrationFormPanel>(E_UI_Layer.Mid, (p) => GameManager.UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) =>
{ {
p.Init(faultRegName); Debug.Log("加载理论学习面板");
//GameManager.UIMgr.HidePanel<UI_SelectModePanel>();
GameManager.UIMgr.HidePanel<UI_StepsPanel>();
}); });
}
});
//if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(faultRegName, false) == 0)
//{
// GameManager.UIMgr.ShowPanel<UI_FaultRegistrationFormPanel>(E_UI_Layer.Mid, (p) =>
// {
// p.Init(faultRegName);
// });
//}
break; break;
case "InspectionRecordFormBtn": case "InspectionRecordFormBtn":
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(inspectionRecordFormName, false) == 0) if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(inspectionRecordFormName, false) == 0)

23
Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs
View File

@ -76,15 +76,26 @@ public class UI_PPTForPracticePanel : BasePanel
switch (btnName) switch (btnName)
{ {
case "retrun_Btn": case "retrun_Btn":
GameManager.UIMgr.ShowPanel<UI_SelectModePanel>(E_UI_Layer.System, (panel) => if (GameManager.RunModelMgr.SceneType != E_SceneType.Site)
{ {
GameManager.UIMgr.ShowPanel<UI_BGPanel>(E_UI_Layer.Bot, (panel) => GameManager.UIMgr.ShowPanel<UI_SelectModePanel>(E_UI_Layer.System, (panel) =>
{ {
Debug.Log(".1"); GameManager.UIMgr.ShowPanel<UI_BGPanel>(E_UI_Layer.Bot, (panel) =>
GameManager.UIMgr.HidePanel<UI_PPTForPracticePanel>(); {
GameManager.UIMgr.HidePanel<UI_MainTitlePanel>(); Debug.Log(".1");
GameManager.UIMgr.HidePanel<UI_PPTForPracticePanel>();
GameManager.UIMgr.HidePanel<UI_MainTitlePanel>();
});
}); });
}); }
else
{
GameManager.UIMgr.HidePanel<UI_PPTForPracticePanel>();
if (GameManager.UIMgr.GetPanel<UI_BGPanel>() != null)
{
GameManager.UIMgr.HidePanel<UI_BGPanel>();
}
}
//Bootstrap.Instance.uiManager.HidePanel<UI_TipsForPracticePanel>(); //Bootstrap.Instance.uiManager.HidePanel<UI_TipsForPracticePanel>();
break; break;

63
Assets/StreamingAssets/Setting/工具材料.xml
View File

@ -1,63 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--工具材料类型0工具1设备2材料3常驻交互--> <!--工具材料类型0工具1设备2材料3常驻交互-->
<root> <root>
<ToolMaterial id="5001" objName="万用表" type="0"></ToolMaterial> <ToolMaterial id="5001" objName="放大镜" type="0"></ToolMaterial>
<ToolMaterial id="5002" objName="剥线钳" type="0"></ToolMaterial> <ToolMaterial id="5002" objName="剪刀" type="0"></ToolMaterial>
<ToolMaterial id="5003" objName="绝缘螺丝刀" type="0"></ToolMaterial> <ToolMaterial id="5003" objName="解剖刀" type="0"></ToolMaterial>
<ToolMaterial id="5004" objName="验电笔" type="0"></ToolMaterial> <ToolMaterial id="5004" objName="镊子" type="0"></ToolMaterial>
<ToolMaterial id="5005" objName="手机" type="3"></ToolMaterial>
<ToolMaterial id="5006" objName="工作票按钮" type="3"></ToolMaterial>
<ToolMaterial id="5007" objName="拆装工单按钮" type="3"></ToolMaterial>
<ToolMaterial id="5008" objName="国网安全帽" type="0"></ToolMaterial>
<ToolMaterial id="5009" objName="工作服" type="0"></ToolMaterial>
<ToolMaterial id="5010" objName="编织手套" type="0"></ToolMaterial>
<ToolMaterial id="5011" objName="绝缘靴" type="0"></ToolMaterial>
<ToolMaterial id="5012" objName="镜子" type="3"></ToolMaterial>
<ToolMaterial id="5013" objName="低压工作票确认按钮" type="3"></ToolMaterial>
<ToolMaterial id="5014" objName="工作证" type="0"></ToolMaterial>
<ToolMaterial id="5015" objName="盒装封印" type="2"></ToolMaterial>
<ToolMaterial id="5016" objName="绝缘胶带" type="2"></ToolMaterial>
<ToolMaterial id="5017" objName="三相四线费控智能电能表" type="1"></ToolMaterial>
<ToolMaterial id="5018" objName="NPC客户" type="3"></ToolMaterial>
<ToolMaterial id="5019" objName="背包按钮" type="3"></ToolMaterial>
<ToolMaterial id="5020" objName="NPC负责人" type="3"></ToolMaterial>
<ToolMaterial id="5021" objName="插座" type="3"></ToolMaterial>
<ToolMaterial id="5022" objName="柜门" type="3"></ToolMaterial>
<ToolMaterial id="5023" objName="电能表封印" type="3"></ToolMaterial>
<ToolMaterial id="5024" objName="电能表盖子" type="3"></ToolMaterial>
<ToolMaterial id="5025" objName="电能表螺丝" type="3"></ToolMaterial>
<ToolMaterial id="5026" objName="扳手" type="0"></ToolMaterial>
<ToolMaterial id="5027" objName="绝缘导线" type="2"></ToolMaterial>
<ToolMaterial id="5028" objName="尖嘴钳" type="0"></ToolMaterial>
<ToolMaterial id="5029" objName="斜口钳" type="0"></ToolMaterial>
<ToolMaterial id="5030" objName="低压电流互感器" type="1"></ToolMaterial>
<ToolMaterial id="5031" objName="联合接线盒" type="0"></ToolMaterial>
<ToolMaterial id="5032" objName="三相四线智能电能表" type="1"></ToolMaterial>
<ToolMaterial id="5033" objName="围栏" type="2"></ToolMaterial>
<ToolMaterial id="5034" objName="采集器" type="1"></ToolMaterial>
<ToolMaterial id="5035" objName="电能表校验仪器" type="0"></ToolMaterial>
<ToolMaterial id="5036" objName="u盘" type="0"></ToolMaterial>
<ToolMaterial id="5037" objName="工作牌_从此进出" type="2"></ToolMaterial>
<ToolMaterial id="5038" objName="工作牌_在此工作" type="2"></ToolMaterial>
<ToolMaterial id="5039" objName="盒装SIM卡" type="2"></ToolMaterial>
<ToolMaterial id="5040" objName="分路负荷监测仪" type="0"></ToolMaterial>
<ToolMaterial id="5041" objName="护目镜" type="0"></ToolMaterial>
<ToolMaterial id="5042" objName="工作牌_从此上下" type="2"></ToolMaterial>
<ToolMaterial id="5043" objName="工作牌_已接地" type="2"></ToolMaterial>
<ToolMaterial id="5044" objName="工作牌_止步高压危险" type="2"></ToolMaterial>
<ToolMaterial id="5045" objName="工作牌_禁止分闸" type="2"></ToolMaterial>
<ToolMaterial id="5046" objName="工作牌_禁止合闸" type="2"></ToolMaterial>
<ToolMaterial id="5047" objName="工作牌_禁止合闸有人工作" type="2"></ToolMaterial>
<ToolMaterial id="5048" objName="工作牌_禁止合闸线路有人工作" type="2"></ToolMaterial>
<ToolMaterial id="5049" objName="工作牌_禁止攀登高压危险" type="2"></ToolMaterial>
<ToolMaterial id="5050" objName="工作牌_安全生产十不干" type="2"></ToolMaterial>
<ToolMaterial id="5051" objName="分路负荷监测仪" type="1"></ToolMaterial>
<ToolMaterial id="5052" objName="单相表" type="1"></ToolMaterial>
<ToolMaterial id="5053" objName="熔断器操作手柄" type="0"></ToolMaterial>
<ToolMaterial id="5054" objName="紧线器" type="0"></ToolMaterial>
<ToolMaterial id="5055" objName="红外热成像仪" type="0"></ToolMaterial>
<ToolMaterial id="5056" objName="专变电台" type="1"></ToolMaterial>
<ToolMaterial id="5057" objName="专变采集终端" type="1"></ToolMaterial>
<ToolMaterial id="5058" objName="功率计" type="0"></ToolMaterial>
<ToolMaterial id="5059" objName="便携式钳形相位伏安表" type="0"></ToolMaterial>
</root> </root>

2
Assets/StreamingAssets/Setting/科目/10002/10002_2002_计量装置轮换.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<TB_System id="10002" systemName="酿酒高粱的形态特征及类型识别" loadName="酿酒高粱的形态特征及类型识别" titleName="酿酒高粱的形态特征及类型识别"> <TB_System id="10002" systemName="酿酒高粱的形态特征及类型识别" loadName="酿酒高粱的形态特征及类型识别" titleName="酿酒高粱的形态特征及类型识别">
<Subject id="2002" deviceTypeId="20002" schemeName="酿酒高粱的形态特征及类型识别" deviceMap="单相表" isFault="0" schemeDes="" ToolOrMaterilOrDevice="剥线钳,绝缘螺丝刀"> <Subject id="2002" deviceTypeId="20002" schemeName="酿酒高粱的形态特征及类型识别" deviceMap="单相表" isFault="0" schemeDes="" ToolOrMaterilOrDevice="放大镜,剪刀,解剖刀,镊子">
<Process id="" processName="观察高粱特征" processDes=""> <Process id="" processName="观察高粱特征" processDes="">
<Step id="" subProcessName="从老师处拿取工具" isPrecondition="FALSE" precondition="" tipTitle="" tips=""> <Step id="" subProcessName="从老师处拿取工具" isPrecondition="FALSE" precondition="" tipTitle="" tips="">
<operation id="" subProcessStepName="填写拆装工作单" isPrecondition="" precondition="Office" triggerID="拆装工单按钮" tipTitle="请填写拆装工作单" score=""></operation> <operation id="" subProcessStepName="填写拆装工作单" isPrecondition="" precondition="Office" triggerID="拆装工单按钮" tipTitle="请填写拆装工作单" score=""></operation>