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

修改工具间物品增加删除的功能

This commit is contained in:
YangHua 2024-08-26 08:37:53 +08:00
parent 4a3f280adc
commit 20c3de29d0
12 changed files with 128 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

70
Assets/Scenes/04_ToolMaterialScene.unity
View File

@ -140,7 +140,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_RootOrder
value: 16
value: 15
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalScale.y
@ -296,7 +296,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_RootOrder
value: 5
value: 13
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalScale.y
@ -382,7 +382,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_RootOrder
value: 19
value: 21
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_LocalScale.y
@ -858,7 +858,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_RootOrder
value: 13
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_LocalPosition.x
@ -924,7 +924,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_RootOrder
value: 12
value: 18
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_LocalPosition.x
@ -1000,7 +1000,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_RootOrder
value: 7
value: 14
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_LocalScale.y
@ -1118,28 +1118,28 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 755257576}
- {fileID: 381010250}
- {fileID: 665231068}
- {fileID: 1986702133}
- {fileID: 77038122544807096}
- {fileID: 2201113306574956246}
- {fileID: 1679836977}
- {fileID: 1658284320}
- {fileID: 1745229905514037886}
- {fileID: 755257576}
- {fileID: 1377930082}
- {fileID: 4321194316212246351}
- {fileID: 1856251644}
- {fileID: 3421347699316710321}
- {fileID: 75212183}
- {fileID: 2201113306574956246}
- {fileID: 860489969}
- {fileID: 4762243372118872814}
- {fileID: 1658284320}
- {fileID: 1679836977}
- {fileID: 1745229905514037886}
- {fileID: 502530971}
- {fileID: 381010250}
- {fileID: 1986702133}
- {fileID: 1125957365}
- {fileID: 41623819}
- {fileID: 1856251644}
- {fileID: 1078771119}
- {fileID: 112081229}
- {fileID: 1377930082}
- {fileID: 4762243372118872814}
- {fileID: 2125537072}
- {fileID: 502530971}
- {fileID: 1078771119}
- {fileID: 1125957365}
- {fileID: 112081229}
- {fileID: 1310679821}
- {fileID: 1502242985}
m_Father: {fileID: 0}
@ -1227,7 +1227,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_RootOrder
value: 18
value: 19
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_LocalPosition.x
@ -1293,7 +1293,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_RootOrder
value: 15
value: 20
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_LocalPosition.x
@ -1479,7 +1479,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_RootOrder
value: 20
value: 9
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalPosition.x
@ -1619,7 +1619,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_RootOrder
value: 9
value: 6
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_LocalPosition.x
@ -1685,7 +1685,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_RootOrder
value: 10
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_LocalPosition.x
@ -1886,7 +1886,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_RootOrder
value: 17
value: 11
objectReference: {fileID: 0}
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_LocalPosition.x
@ -2061,7 +2061,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_RootOrder
value: 14
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalPosition.x
@ -2292,7 +2292,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_RootOrder
value: 21
value: 17
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalPosition.x
@ -2374,7 +2374,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_LocalPosition.x
@ -2675,7 +2675,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_RootOrder
value: 11
value: 7
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_LocalPosition.x
@ -2901,7 +2901,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_RootOrder
value: 0
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_LocalPosition.x
@ -3218,7 +3218,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_RootOrder
value: 4
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_LocalPosition.x
@ -3691,7 +3691,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_RootOrder
value: 3
value: 10
objectReference: {fileID: 0}
- target: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_LocalPosition.x
@ -3838,7 +3838,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_RootOrder
value: 8
value: 16
objectReference: {fileID: 0}
- target: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_LocalPosition.x
@ -4648,7 +4648,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_RootOrder
value: 6
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_LocalPosition.x

7
Assets/Scripts/CXX/Devices/Device_Base.cs
View File

@ -11,16 +11,15 @@ public class Device_Base : PermanentTriggerBase
protected override void OnStart()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnStart();
Debug.Log("Device_Base PermanentTriggerBase");
}
}
protected override void OnMEnter()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site && GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
base.OnMEnter();
_highlight.SetHighlighted(true);
@ -28,7 +27,7 @@ public class Device_Base : PermanentTriggerBase
}
protected override void OnMExit()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
if (GameManager.RunModelMgr.SceneType == E_SceneType.Site && GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
base.OnMExit();
_highlight.SetHighlighted(false);

3
Assets/Scripts/CXX/Devices/计量柜/Device_CabinetDoor.cs
View File

@ -48,7 +48,8 @@ public class Device_CabinetDoor : Device_Base
}
protected override void OnMDown()
{
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê") return;
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "Ñéµç±Ê")
return;
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, true) == 0)
{
base.OnMDown();

2
Assets/Scripts/CXX/StepState/1002/StepState_1002.cs
View File

@ -63,7 +63,7 @@ public class StepState_1002 : StepState
//攣횅淪陋
//헌왕교관
PacksackBagMgr.Instance.ClearAllData();
PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial();
//뻘覩새솥

6
Assets/Scripts/CXX/Tools/Tool_Base.cs
View File

@ -14,14 +14,14 @@ public class Tool_Base : PermanentTriggerBase
protected override void OnStart()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
if ( GameManager.RunModelMgr.SceneType == E_SceneType.Site)
{
base.OnStart();
}
}
protected override void OnMEnter()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
if (GameManager.RunModelMgr.SceneType == E_SceneType.Site && GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
base.OnMEnter();
_highlight.SetHighlighted(true);
@ -30,7 +30,7 @@ public class Tool_Base : PermanentTriggerBase
}
protected override void OnMExit()
{
if (GameManager.RunModelMgr == null && GameManager.RunModelMgr.SceneType == E_SceneType.Site)
if (GameManager.RunModelMgr.SceneType == E_SceneType.Site && GameManager.RunModelMgr.ModeType != E_ModeType.Study)
{
base.OnMExit();
_highlight.SetHighlighted(false);

20
Assets/Scripts/CXX/Tools/Tool_Screwdriver.cs
View File

@ -26,7 +26,7 @@ public class Tool_Screwdriver : Tool_Base
/// <param name="screw"></param>
public void UnInstall(Tool_Screw screw)
{
if (screw.isInstall )
if (screw.isInstall)
{
screw.BeUnInstalled(this);
}
@ -44,7 +44,7 @@ public class Tool_Screwdriver : Tool_Base
Tool_Screw ts = hit.transform.GetComponent<Tool_Screw>();
if (ts != null)
{
if(ts.id== "电能表盖子固定螺丝1" && !SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.isCut)
if (ts.id == "µçÄܱí¸Ç×ӹ̶¨ÂÝË¿1" && !SiteManager.instance.measuringCabinet.meteringDevice.cover.cover_seal_Left.isCut)
{
Debug.Log("·âӡδ¼ô¶Ï");
return;
@ -55,14 +55,16 @@ public class Tool_Screwdriver : Tool_Base
Debug.Log("·âӡδ¼ô¶Ï");
return;
}
if (ts.isInstall)
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(ts.triggerName, false) == 0)
{
UnInstall(ts);
}
else
{
Install(ts);
if (ts.isInstall)
{
UnInstall(ts);
}
else
{
Install(ts);
}
}
}
}

70
Assets/Scripts/CXX/Tools/Tool_TestPen.cs
View File

@ -17,26 +17,30 @@ public class Tool_TestPen : Tool_Base
private void Update()
{
if (Input.GetMouseButtonDown(0))
if (GameManager.RunModelMgr.SceneType != E_SceneType.Site) return;
if (LiveSceneManager.Instance.currentTool != null && LiveSceneManager.Instance.currentTool.name == "验电笔")
{
//点击螺丝验电
Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(tmpray, out RaycastHit hit))
if (Input.GetMouseButtonDown(0))
{
//插座
Device_Base db = hit.transform.GetComponent<Device_Base>();
if (db != null)
//点击螺丝验电
Ray tmpray = Camera.main.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(tmpray, out RaycastHit hit))
{
Test(db);
return;
}
//插座/柜门
Device_Base db = hit.transform.GetComponent<Device_Base>();
if (db != null)
{
Test(db);
return;
}
//螺丝
Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
if (tb != null)
{
Test(tb);
return;
//螺丝
Tool_Base tb = hit.transform.GetComponent<Tool_Base>();
if (tb != null)
{
Test(tb);
return;
}
}
}
}
@ -92,24 +96,24 @@ public class Tool_TestPen : Tool_Base
}
}
/// <summary>
/// 执行验电操作
/// </summary>
/// <param name="tool_base">被验电设备</param>
public void Test(Tool_Base tool_base)
/// <summary>
/// 执行验电操作
/// </summary>
/// <param name="tool_base">被验电设备</param>
public void Test(Tool_Base tool_base)
{
if (tool_base.toolType == ToolType.螺丝)
{
if (tool_base.toolType == ToolType.螺丝)
{
var tmp = ((Tool_Screw)tool_base);
//位置移动
transform.position = tmp.installPos.position;
transform.localEulerAngles = tmp.installPos.localEulerAngles;
Debug.Log("螺丝 已验电");
isFlicker = tmp.hasElectricity;
}
screem.materials[0].color = isFlicker ? Color.red : Color.white;
var tmp = ((Tool_Screw)tool_base);
//位置移动
transform.position = tmp.installPos.position;
transform.localEulerAngles = tmp.installPos.localEulerAngles;
Debug.Log("螺丝 已验电");
isFlicker = tmp.hasElectricity;
}
screem.materials[0].color = isFlicker ? Color.red : Color.white;
}
}

2
Assets/Scripts/Project/Manager/PacksackBagMgr.cs
View File

@ -104,6 +104,7 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
/// </summary>
public void ClearAllData()
{
wearDic.Clear();
toolAndMaterialDic.Clear();
}
@ -113,6 +114,7 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
/// </summary>
public void ClearAllToolAndDiveceAndMaterial()
{
foreach (var item in toolAndMaterialDic.Keys)
{
List<ItemInfo> temp = toolAndMaterialDic[item];

28
Assets/Scripts/Project/Manager/TooRoomMannger.cs
View File

@ -6,7 +6,7 @@ using UnityEngine;
public class TooRoomMannger : SingletonMono<TooRoomMannger>
{
public BaseToolOrDevice[] allTMDs;
public List<BaseToolOrDevice> allTMDs;
public Transform toolParent;
public Transform headSlot;
public Transform bodySlot;
@ -17,7 +17,7 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
void Start()
{
allTMDs = toolParent.GetComponentsInChildren<BaseToolOrDevice>(true);
allTMDs = toolParent.GetComponentsInChildren<BaseToolOrDevice>(true).ToList();
_cancel = new List<Material>();
@ -29,9 +29,31 @@ public class TooRoomMannger : SingletonMono<TooRoomMannger>
{
tmd.GetInfo();
}
RemoveRepeat();
}
/// <summary>
/// /ÒƳýÖظ´ÎÊÌâ
/// </summary>
public void RemoveRepeat()
{
var bagDatas = GameManager.PacksackBagMgr.GetCurrentBagData();
foreach (var item in bagDatas.Values)
{
foreach (var itemI in item)
{
for (int i = 0; i < allTMDs.Count; i++)
{
int index = i;
if (itemI.selfPosInToolRoom == allTMDs[index].itemInfo.selfPosInToolRoom)
{
Destroy(allTMDs[index].gameObject);
allTMDs.Remove(allTMDs[index]);
}
}
}
}
}
public void Wear(string equipName, bool isChange)

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

@ -23,22 +23,24 @@ public class PermanentTriggerBase : MonoBehaviour
}
private void SwitchSubProcessStepTriggerID(string arg0)
{
if (_highlight == null) return;
if (triggerName == arg0)
{
_highlight.SetHighlighted(true);
Debug.Log("PermanentTriggerBase我应该提示");
}
else
{
_highlight.SetHighlighted(false);
}
}
/// <summary>
/// Awake
/// </summary>
protected virtual void OnAwake()
{
_highlight = GetComponent<HighlightEffect>();
if (GetComponent<HighlightEffect>())
_highlight = GetComponent<HighlightEffect>();
}
/// <summary>
/// Start

10
Assets/Scripts/ProjectBase/ScenesManager/ScenesManager.cs
View File

@ -44,11 +44,6 @@ public class ScenesManager : BaseManager<ScenesManager>
private IEnumerator ReallyLoadScene(string sceneName, UnityAction action = null,
LoadSceneMode loadSceneMode = LoadSceneMode.Single)
{
AsyncOperation ao = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
while (!ao.isDone)
{
yield return null;
}
E_SceneType currentSceneName;
switch (sceneName)
{
@ -66,6 +61,11 @@ public class ScenesManager : BaseManager<ScenesManager>
break;
}
GameManager.RunModelMgr.SceneType = currentSceneName;
AsyncOperation ao = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
while (!ao.isDone)
{
yield return null;
}
action?.Invoke();
}
}