huqibin
/
new_10009_YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0120

This commit is contained in:
huqibin 2025-01-20 13:52:28 +08:00
parent 1b5ad67dcb
commit 5f0c4728da
5 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Assets/Scenes/10009_9001_04_ToolMaterialScene.unity
View File

@ -8086,6 +8086,8 @@ MonoBehaviour:
toolOrDeviceOrMaterial: 0
objPrefab: {fileID: 0}
selfPosInToolRoom: {x: 0, y: 0, z: 0}
selfAngleInToolRoom: {x: 0, y: 0, z: 0}
index: 0
_highlight: {fileID: 0}
--- !u!65 &1907965720
BoxCollider:
@ -8865,6 +8867,34 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5370190688320940380, guid: 906cc253ee10599478864236a349d004, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5370190690016237131, guid: 906cc253ee10599478864236a349d004, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5755307409124852210, guid: 906cc253ee10599478864236a349d004, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6255899804326469815, guid: 906cc253ee10599478864236a349d004, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6846643171150490252, guid: 906cc253ee10599478864236a349d004, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7017702842354808853, guid: 906cc253ee10599478864236a349d004, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7646237617077493431, guid: 906cc253ee10599478864236a349d004, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4487972598169150845, guid: 906cc253ee10599478864236a349d004, type: 3}
- {fileID: 6573384303805956468, guid: 906cc253ee10599478864236a349d004, type: 3}

4
Assets/Scripts/StepState_9001.cs
View File

@ -41,8 +41,8 @@ public class StepState_9001 : StepState
if (num == 1)//正确着装
{
//办公室场景首个步骤
//查看任务单
//OfficeManager.Instance.mobileController.downIndex = 0;
//ÕýÈ·×Å×°
TooRoomMannger.Instance.CreateTool();
PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial();
TooRoomMannger.Instance.CheckWearByWearDic();

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

@ -32,8 +32,6 @@
<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="绝缘铲" type="0"></ToolMaterial>

13
Assets/Template/Scripts/Project/Manager/PacksackBagMgr.cs
View File

@ -127,19 +127,6 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
/// </summary>
public void ClearAllToolAndDiveceAndMaterial()
{
foreach (var item in toolAndMaterialDic.Keys)
{
List<ItemInfo> temp = toolAndMaterialDic[item];
for (int j = 0; j < temp.Count; j++)
{
int indexJ = j;
GameObject obj = GameObject.Instantiate(temp[indexJ].objPrefab);
obj.name = temp[indexJ].toolName;
obj.transform.position = temp[indexJ].selfPosInToolRoom;
obj.GetComponent<Tool_SelectComponent>().itemInfo = temp[indexJ];
obj.GetComponent<Tool_SelectComponent>().GetInfo();
}
}
ClearAllData();
}

15
Assets/Template/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
View File

@ -65,14 +65,17 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
Destroy(gameObject);
break;
case "iconBtn":
if(currentItem.toolName == "ÊÖ»ú")
if (currentItem.toolName == "ÊÖ»ú")
{
GameManager.UIMgr.HidePanel<UI_ToolAndMaterialPanel>();
GameManager.UIMgr.imageTips.HideTips();
GameManager.UIMgr.ShowPanel<UI_PhonePanel>(E_UI_Layer.Mid, (panel) =>
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, false) == 0)
{
panel.Init("ÊÖ»ú", Input.mousePosition);
});
GameManager.UIMgr.HidePanel<UI_ToolAndMaterialPanel>();
GameManager.UIMgr.imageTips.HideTips();
GameManager.UIMgr.ShowPanel<UI_PhonePanel>(E_UI_Layer.Mid, (panel) =>
{
panel.Init("ÊÖ»ú", Input.mousePosition);
});
}
return;
}
bool isWorkCard = currentItem.toolName.Equals("¹¤×÷Ö¤") ? false : true;