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

1

This commit is contained in:
yanghua 2024-12-26 11:23:56 +08:00
parent 7ac8ba0cf7
commit 21aafe0d13
4 changed files with 91 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/Scenes/10009_9001_05_LiveScene.unity
View File

@ -6069,14 +6069,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 426546330} m_GameObject: {fileID: 426546330}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalRotation: {x: 0.63370395, y: -0.00000002897595, z: 0.00000002897595, w: 0.7735757}
m_LocalPosition: {x: -0.00066, y: -0.0347, z: -0.0568} m_LocalPosition: {x: 0.0121, y: -0.0347, z: -0.0322}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 2083840155} m_Father: {fileID: 2083840155}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 78.648, y: 0, z: 0}
--- !u!1001 &430898464 --- !u!1001 &430898464
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11556,7 +11556,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 890581128} - component: {fileID: 890581128}
- component: {fileID: 890581130} - component: {fileID: 890581130}
- component: {fileID: 890581129}
- component: {fileID: 890581131} - component: {fileID: 890581131}
m_Layer: 0 m_Layer: 0
m_Name: NPCCustomController m_Name: NPCCustomController
@ -11584,18 +11583,6 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 62.437, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 62.437, z: 0}
--- !u!114 &890581129
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 890581127}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &890581130 --- !u!114 &890581130
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -14318,7 +14305,6 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1198127457} - component: {fileID: 1198127457}
- component: {fileID: 1198127456} - component: {fileID: 1198127456}
- component: {fileID: 1198127455}
- component: {fileID: 1198127454} - component: {fileID: 1198127454}
m_Layer: 0 m_Layer: 0
m_Name: NPCHeadController m_Name: NPCHeadController
@ -14341,18 +14327,6 @@ CapsuleCollider:
m_Height: 2 m_Height: 2
m_Direction: 1 m_Direction: 1
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1198127455
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1198127453}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1198127456 --- !u!114 &1198127456
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Scripts/StepState_9001.cs
View File

@ -79,7 +79,7 @@ public class StepState_9001 : StepState
PacksackBagMgr.Instance.WearItemState(item, true); PacksackBagMgr.Instance.WearItemState(item, true);
}); });
//生成工具 //生成工具
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);

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

@ -47,6 +47,7 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
switch (btnName) switch (btnName)
{ {
case "itemCloseBtn": case "itemCloseBtn":
if (currentItem.toolName == "手机") return;
int counts = 0; ; int counts = 0; ;
if (itemInfoList.Count > 1) if (itemInfoList.Count > 1)
{ {

86
new_10009_YanCheng_Metrology.sln Normal file
View File

@ -0,0 +1,86 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{235239D7-F2A6-1638-9C0B-0289E06C88F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask", "UniTask.csproj", "{E277CD21-921B-44C7-5143-913CDCAC366F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Linq", "UniTask.Linq.csproj", "{64AAF0E3-1F00-C053-44F7-2BF443159222}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniRx", "UniRx.csproj", "{28274062-46C5-F5C3-044C-D0F607B7697E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{203E20D8-509F-3D67-124A-3C6EC1E91034}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{9365F4C4-9C60-B392-01F0-91E056F36D88}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{460EF927-E121-9990-B653-19E623FC2DC4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{28E65BDC-6E43-F05C-89CB-8273D7FFB2B8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor-firstpass", "Assembly-CSharp-Editor-firstpass.csproj", "{2DF52683-2BA7-29E6-C9EC-14E4C88B79CB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{0A1D427E-778D-3A22-0A72-C56DA3684820}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Editor", "UniTask.Editor.csproj", "{5D6297FA-FA33-8398-7A4B-F96432643DF4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sirenix.OdinInspector.Modules.UnityMathematics", "Sirenix.OdinInspector.Modules.UnityMathematics.csproj", "{4BEAD201-CFBD-634B-2415-FEE167F08738}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{235239D7-F2A6-1638-9C0B-0289E06C88F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{235239D7-F2A6-1638-9C0B-0289E06C88F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{235239D7-F2A6-1638-9C0B-0289E06C88F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{235239D7-F2A6-1638-9C0B-0289E06C88F9}.Release|Any CPU.Build.0 = Release|Any CPU
{E277CD21-921B-44C7-5143-913CDCAC366F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E277CD21-921B-44C7-5143-913CDCAC366F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E277CD21-921B-44C7-5143-913CDCAC366F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E277CD21-921B-44C7-5143-913CDCAC366F}.Release|Any CPU.Build.0 = Release|Any CPU
{64AAF0E3-1F00-C053-44F7-2BF443159222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64AAF0E3-1F00-C053-44F7-2BF443159222}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64AAF0E3-1F00-C053-44F7-2BF443159222}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64AAF0E3-1F00-C053-44F7-2BF443159222}.Release|Any CPU.Build.0 = Release|Any CPU
{28274062-46C5-F5C3-044C-D0F607B7697E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28274062-46C5-F5C3-044C-D0F607B7697E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28274062-46C5-F5C3-044C-D0F607B7697E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28274062-46C5-F5C3-044C-D0F607B7697E}.Release|Any CPU.Build.0 = Release|Any CPU
{203E20D8-509F-3D67-124A-3C6EC1E91034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{203E20D8-509F-3D67-124A-3C6EC1E91034}.Debug|Any CPU.Build.0 = Debug|Any CPU
{203E20D8-509F-3D67-124A-3C6EC1E91034}.Release|Any CPU.ActiveCfg = Release|Any CPU
{203E20D8-509F-3D67-124A-3C6EC1E91034}.Release|Any CPU.Build.0 = Release|Any CPU
{9365F4C4-9C60-B392-01F0-91E056F36D88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9365F4C4-9C60-B392-01F0-91E056F36D88}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9365F4C4-9C60-B392-01F0-91E056F36D88}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9365F4C4-9C60-B392-01F0-91E056F36D88}.Release|Any CPU.Build.0 = Release|Any CPU
{460EF927-E121-9990-B653-19E623FC2DC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{460EF927-E121-9990-B653-19E623FC2DC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{460EF927-E121-9990-B653-19E623FC2DC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{460EF927-E121-9990-B653-19E623FC2DC4}.Release|Any CPU.Build.0 = Release|Any CPU
{28E65BDC-6E43-F05C-89CB-8273D7FFB2B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28E65BDC-6E43-F05C-89CB-8273D7FFB2B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28E65BDC-6E43-F05C-89CB-8273D7FFB2B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28E65BDC-6E43-F05C-89CB-8273D7FFB2B8}.Release|Any CPU.Build.0 = Release|Any CPU
{2DF52683-2BA7-29E6-C9EC-14E4C88B79CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DF52683-2BA7-29E6-C9EC-14E4C88B79CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2DF52683-2BA7-29E6-C9EC-14E4C88B79CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2DF52683-2BA7-29E6-C9EC-14E4C88B79CB}.Release|Any CPU.Build.0 = Release|Any CPU
{0A1D427E-778D-3A22-0A72-C56DA3684820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A1D427E-778D-3A22-0A72-C56DA3684820}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A1D427E-778D-3A22-0A72-C56DA3684820}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A1D427E-778D-3A22-0A72-C56DA3684820}.Release|Any CPU.Build.0 = Release|Any CPU
{5D6297FA-FA33-8398-7A4B-F96432643DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D6297FA-FA33-8398-7A4B-F96432643DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D6297FA-FA33-8398-7A4B-F96432643DF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D6297FA-FA33-8398-7A4B-F96432643DF4}.Release|Any CPU.Build.0 = Release|Any CPU
{4BEAD201-CFBD-634B-2415-FEE167F08738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BEAD201-CFBD-634B-2415-FEE167F08738}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BEAD201-CFBD-634B-2415-FEE167F08738}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BEAD201-CFBD-634B-2415-FEE167F08738}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal