WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: WangWeiZhi:7537c5e5d144aae8c5cba6cffb50d57e302d4f93
Branches Tags
WangWeiZhi:main
WangWeiZhi:HQB_workspace
...
compare: WangWeiZhi:f3cfd65e998796df42a67f9b539505cc7c7f2cde
Branches Tags
WangWeiZhi:HQB_workspace
WangWeiZhi:main

3 Commits
7537c5e5d1 ... f3cfd65e99

Author SHA1 Message Date
YangHua f3cfd65e99 修改数据 2024-08-30 16:45:37 +08:00
YangHua 19c7ba55bf Merge branch 'main' of http://7d2f0537.r5.cpolar.top/WangWeiZhi/YanCheng_Metrology 2024-08-30 16:37:11 +08:00
YangHua da9cef79e3 修改练习问题 2024-08-30 16:37:08 +08:00
11 changed files with 55 additions and 38 deletions
Show Stats Expand all files Collapse all files

BIN
Assets/ArtRes/Excel/Config.xlsx
View File

Binary file not shown.

9
Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs
View File

@ -50,7 +50,8 @@ public class Device_MeasuringCabinet : MonoBehaviour
private void Awake() private void Awake()
{ {
AddActions(); AddActions();
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
sundries.gameObject.SetActive(false); sundries.gameObject.SetActive(false);
} }
/// <summary> /// <summary>
@ -291,10 +292,12 @@ public class Device_MeasuringCabinet : MonoBehaviour
private void OnDestroy() private void OnDestroy()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
private void OnDisable() private void OnDisable()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
} }

4
Assets/Scripts/Editor/Tools/Tools.cs
View File

@ -157,10 +157,6 @@ public class Tools
{ {
case "int": case "int":
Debug.Log($"当前表{dataTable.TableName},当前行列:{i}_______{j}"); Debug.Log($"当前表{dataTable.TableName},当前行列:{i}_______{j}");
if(dataTable.TableName== "TB_SubProcessStep" && i==61)
{
Debug.Log("aa");
}
fs.Write(BitConverter.GetBytes(int.Parse(row[j].ToString())), 0, 4); fs.Write(BitConverter.GetBytes(int.Parse(row[j].ToString())), 0, 4);
break; break;
case "bool": case "bool":

7
Assets/Scripts/Project/Manager/OfficeManager.cs
View File

@ -64,8 +64,11 @@ public class OfficeManager : SingletonMono<OfficeManager>
{ {
panel.Init(GameManager.ProcessMgr.subProcessId); panel.Init(GameManager.ProcessMgr.subProcessId);
}); });
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId); {
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
}
} }
GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) => GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>

6
Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
View File

@ -56,7 +56,8 @@ public class PermanentTriggerBase : MonoBehaviour
{ {
if (GetComponent<HighlightEffect>()) if (GetComponent<HighlightEffect>())
_highlight = GetComponent<HighlightEffect>(); _highlight = GetComponent<HighlightEffect>();
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
/// <summary> /// <summary>
/// Start /// Start
@ -96,7 +97,8 @@ public class PermanentTriggerBase : MonoBehaviour
private void OnDestroy() private void OnDestroy()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
//private void OnDisable() //private void OnDisable()
//{ //{

6
Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs
View File

@ -29,7 +29,8 @@ public abstract class BaseToolOrDevice : MonoBehaviour
private void Awake() private void Awake()
{ {
_highlight = GetComponent<HighlightEffect>(); _highlight = GetComponent<HighlightEffect>();
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
private void SwitchSubProcessStepTriggerID(string arg0) private void SwitchSubProcessStepTriggerID(string arg0)
@ -105,7 +106,8 @@ public abstract class BaseToolOrDevice : MonoBehaviour
private void OnDestroy() private void OnDestroy()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
//private void OnDisable() //private void OnDisable()
//{ //{

9
Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs
View File

@ -20,7 +20,8 @@ public class UI_CheckMyselfItem : BaseItem
tips.text = isOn ? "ÒÑ×°Åä" : ""; tips.text = isOn ? "ÒÑ×°Åä" : "";
} }
GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + _itemInfo.toolName); GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + _itemInfo.toolName);
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
@ -56,11 +57,13 @@ public class UI_CheckMyselfItem : BaseItem
private void OnDestroy() private void OnDestroy()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
private void OnDisable() private void OnDisable()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
} }

22
Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
View File

@ -14,17 +14,21 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
{ {
itemInfoList = _itemInfo; itemInfoList = _itemInfo;
currentItem = itemInfoList[0]; currentItem = itemInfoList[0];
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
itemCloseBtn.gameObject.SetActive(false);
}
if (GameManager.RunModelMgr.SceneType != E_SceneType.Site) if (GameManager.RunModelMgr.SceneType != E_SceneType.Site)
{ {
GetControl<Image>("iconBtn").GetComponent<Button>().interactable = false; GetControl<Image>("iconBtn").GetComponent<Button>().interactable = false;
} }
else
{
itemCloseBtn.gameObject.SetActive(false);
}
GetControl<TextMeshProUGUI>("countText").text = _itemInfo.Count.ToString(); GetControl<TextMeshProUGUI>("countText").text = _itemInfo.Count.ToString();
GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + currentItem.toolName); GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + currentItem.toolName);
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
{
itemCloseBtn.gameObject.SetActive(false);
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
}
} }
private void SwitchSubProcessStepTriggerID(string arg0) private void SwitchSubProcessStepTriggerID(string arg0)
{ {
@ -56,7 +60,7 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
Destroy(gameObject); Destroy(gameObject);
break; break;
case "iconBtn": case "iconBtn":
bool isWorkCard = currentItem.toolName.Equals("¹¤×÷Ö¤") ? false : true; bool isWorkCard = currentItem.toolName.Equals("¹¤×÷Ö¤") ? false : true;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, isWorkCard) == 0) if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, isWorkCard) == 0)
{ {
GameManager.UIMgr.HidePanel<UI_ToolAndMaterialPanel>(); GameManager.UIMgr.HidePanel<UI_ToolAndMaterialPanel>();
@ -72,11 +76,13 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
} }
private void OnDestroy() private void OnDestroy()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
private void OnDisable() private void OnDisable()
{ {
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
} }

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

@ -48,11 +48,14 @@ public class UI_MenuBar : BasePanel
toolKitBtn = GetControl<Button>("ToolKitBtn"); toolKitBtn = GetControl<Button>("ToolKitBtn");
disassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn"); disassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn");
notifyBtn = GetControl<Button>("NotifyBtn"); notifyBtn = GetControl<Button>("NotifyBtn");
if (GameManager.RunModelMgr.ModeType == E_ModeType.Practice)
OpenMenu();
} }
public override void ShowMe() public override void ShowMe()
{ {
GameManager.EventMgr.AddEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName); GameManager.EventMgr.AddEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName);
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
private void SwitchSubProcessStepTriggerID(string triggerID) private void SwitchSubProcessStepTriggerID(string triggerID)
@ -111,12 +114,13 @@ public class UI_MenuBar : BasePanel
public override void HideMe() public override void HideMe()
{ {
GameManager.EventMgr.RemoveEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName); GameManager.EventMgr.RemoveEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName);
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
} }
public void CheckBtnBySceneName(E_SceneType type) public void CheckBtnBySceneName(E_SceneType type)
{ {
Debug.Log(type.ToString()); Debug.Log(type.ToString());
CloseMenu(); //CloseMenu();
toolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom); toolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom);
siteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom); siteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
workOrderBtn.gameObject.SetActive(type == E_SceneType.Office); workOrderBtn.gameObject.SetActive(type == E_SceneType.Office);
@ -180,8 +184,8 @@ public class UI_MenuBar : BasePanel
{ {
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f); GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
}); });
}); });
@ -198,8 +202,8 @@ public class UI_MenuBar : BasePanel
{ {
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f); GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
}); });
}); });
} }
@ -217,8 +221,8 @@ public class UI_MenuBar : BasePanel
{ {
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f); GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType); GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
}); });
}); });
} }
@ -247,10 +251,7 @@ public class UI_MenuBar : BasePanel
case "ToolKitBtn": case "ToolKitBtn":
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(toolKitName, true) == 0) if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(toolKitName, true) == 0)
{ {
GameManager.UIMgr.ShowPanel<UI_ToolAndMaterialPanel>(E_UI_Layer.Mid, (p) => GameManager.UIMgr.ShowPanel<UI_ToolAndMaterialPanel>(E_UI_Layer.Mid);
{
});
} }
break; break;
case "NotifyBtn": case "NotifyBtn":

3
Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
View File

@ -43,7 +43,8 @@ public class UI_ToolAndMaterialPanel : BasePanel
uiTMDitem.Init(bagDatas[item]); uiTMDitem.Init(bagDatas[item]);
} }
} }
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.subProcessStepTriggerID); if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.subProcessStepTriggerID);
} }

BIN
Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary
View File

Binary file not shown.