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

扩展背包逻辑

This commit is contained in:
YangHua 2024-08-20 11:00:35 +08:00
parent 6ff48f9479
commit c5009ae3f3
7 changed files with 201 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
Assets/Scenes/04_ToolMaterialScene.unity
View File

@ -218,7 +218,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1776503018750407771, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
propertyPath: m_RootOrder
@ -271,6 +271,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8155783817937420856, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
m_PrefabInstance: {fileID: 75212182}
m_PrefabAsset: {fileID: 0}
--- !u!114 &75212184 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 496720292907478367, guid: bfda44a00cab89b47bde668b2b482a26, type: 3}
m_PrefabInstance: {fileID: 75212182}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &665231068 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
@ -656,7 +667,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3945920568849990411, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
propertyPath: m_RootOrder
@ -709,6 +720,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8488133114798062186, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
m_PrefabInstance: {fileID: 860489968}
m_PrefabAsset: {fileID: 0}
--- !u!114 &860489970 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3056773142408046311, guid: 7e5755c1fdd628b4a8505213826ebf4c, type: 3}
m_PrefabInstance: {fileID: 860489968}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &901742060
GameObject:
m_ObjectHideFlags: 0
@ -1023,7 +1045,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2528995886889388087, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
@ -1032,6 +1054,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
m_PrefabInstance: {fileID: 1510720946}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1510720948 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8214283074376986841, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
m_PrefabInstance: {fileID: 1510720946}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!64 &1789438301
MeshCollider:
m_ObjectHideFlags: 0
@ -1297,7 +1330,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477856, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_RootOrder
@ -1350,6 +1383,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
m_PrefabInstance: {fileID: 1943116161}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1943116163 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8642374616707477862, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
m_PrefabInstance: {fileID: 1943116161}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2075661853
GameObject:
m_ObjectHideFlags: 0
@ -1394,6 +1438,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: efa839f070de80947a96cae9774ce7e9, type: 3}
m_Name:
m_EditorClassIdentifier:
allTMDs:
- {fileID: 2557768359599646897}
- {fileID: 8642374616143441852}
- {fileID: 77038122544807097}
- {fileID: 260020824035813046}
- {fileID: 4187440228736137476}
- {fileID: 3421347699316710322}
- {fileID: 75212184}
- {fileID: 7719931384355802819}
- {fileID: 860489970}
- {fileID: 1745229905514037887}
- {fileID: 4762243372118872815}
- {fileID: 1943116163}
- {fileID: 1510720948}
--- !u!1 &2090806849
GameObject:
m_ObjectHideFlags: 0
@ -1582,7 +1640,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2528995886889388087, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
@ -1591,6 +1649,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2283832936510184820, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
m_PrefabInstance: {fileID: 77038122544807095}
m_PrefabAsset: {fileID: 0}
--- !u!114 &77038122544807097 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8214283074376986841, guid: c26cb815ef7c52f4790cfe113ed6566f, type: 3}
m_PrefabInstance: {fileID: 77038122544807095}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &260020824035813044
PrefabInstance:
m_ObjectHideFlags: 0
@ -1604,7 +1673,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3700622895044939927, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
propertyPath: m_RootOrder
@ -1657,6 +1726,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 6513467834766798071, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
m_PrefabInstance: {fileID: 260020824035813044}
m_PrefabAsset: {fileID: 0}
--- !u!114 &260020824035813046 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5159517654972794728, guid: 6e7d3b4f0774d834a8aaf8a9ad867596, type: 3}
m_PrefabInstance: {fileID: 260020824035813044}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &543450653332255215
Transform:
m_ObjectHideFlags: 0
@ -1896,7 +1976,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3648551727639942988, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
propertyPath: m_RootOrder
@ -1949,6 +2029,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5690046137980526191, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
m_PrefabInstance: {fileID: 1745229905514037885}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1745229905514037887 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1871459911713902875, guid: 6beefba92932d9d43ae4e3a7513a91e7, type: 3}
m_PrefabInstance: {fileID: 1745229905514037885}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!33 &1857631050215693693
MeshFilter:
m_ObjectHideFlags: 0
@ -2122,7 +2213,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172439, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2557768358979172440, guid: f8a9676618f065446b3926269089375e, type: 3}
propertyPath: m_RootOrder
@ -2170,6 +2261,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f8a9676618f065446b3926269089375e, type: 3}
--- !u!114 &2557768359599646897 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2557768358979172441, guid: f8a9676618f065446b3926269089375e, type: 3}
m_PrefabInstance: {fileID: 2557768359599646896}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &2587898902532246539
Transform:
m_ObjectHideFlags: 0
@ -2374,7 +2476,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3005425371173972425, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
propertyPath: m_RootOrder
@ -2427,6 +2529,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5489651648652364078, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
m_PrefabInstance: {fileID: 3421347699316710320}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3421347699316710322 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5218481190525499163, guid: 5aef7c2d49d8d464ebabb991f9423e2b, type: 3}
m_PrefabInstance: {fileID: 3421347699316710320}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!33 &3431219503311567819
MeshFilter:
m_ObjectHideFlags: 0
@ -2727,7 +2840,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7670065417942988621, guid: 850d184585559a646851b3bf3220e64f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 850d184585559a646851b3bf3220e64f, type: 3}
@ -2736,6 +2849,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 138259078697446989, guid: 850d184585559a646851b3bf3220e64f, type: 3}
m_PrefabInstance: {fileID: 4187440228736137474}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4187440228736137476 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3346917713294978289, guid: 850d184585559a646851b3bf3220e64f, type: 3}
m_PrefabInstance: {fileID: 4187440228736137474}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!23 &4198229849941995259
MeshRenderer:
m_ObjectHideFlags: 0
@ -2874,7 +2998,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6621331633947903829, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
@ -2883,6 +3007,17 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5376839146013080726, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
m_PrefabInstance: {fileID: 4762243372118872813}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4762243372118872815 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5719209178862276995, guid: 98ce40efda21ce94eb0ee07ce95f5dbd, type: 3}
m_PrefabInstance: {fileID: 4762243372118872813}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &4780751698108330340
Transform:
m_ObjectHideFlags: 0
@ -3632,7 +3767,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7175692158753146328, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478404885969365012, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
propertyPath: m_RootOrder
@ -3680,6 +3815,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
--- !u!114 &7719931384355802819 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2663764905760382546, guid: 2156e2fd42e37ee40a9c53abb6dd458f, type: 3}
m_PrefabInstance: {fileID: 7719931384355802818}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7785980324569223954
GameObject:
m_ObjectHideFlags: 0
@ -3778,6 +3924,7 @@ GameObject:
- component: {fileID: 4780751698108330340}
- component: {fileID: 4149183435998775790}
- component: {fileID: 6809742405447132359}
- component: {fileID: 8121870069781662420}
m_Layer: 0
m_Name: Box117
m_TagString: Untagged
@ -3785,6 +3932,20 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!64 &8121870069781662420
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8121870069781662419}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -1041292729156527536, guid: 156cca832bad49447b16a92685b1fa5b, type: 3}
--- !u!1 &8273280625189519447
GameObject:
m_ObjectHideFlags: 0
@ -3928,7 +4089,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477856, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8642374616707477863, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
propertyPath: m_RootOrder
@ -3976,6 +4137,17 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
--- !u!114 &8642374616143441852 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8642374616707477862, guid: 6755528e442f23a418a0c2b4ec3d63d2, type: 3}
m_PrefabInstance: {fileID: 8642374616143441851}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!33 &8767012901301994682
MeshFilter:
m_ObjectHideFlags: 0

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

@ -10,6 +10,7 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
//包里用了哪些工器具
private readonly Dictionary<ItemInfo, List<ItemInfo>> toolAndMaterialDic = new Dictionary<ItemInfo, List<ItemInfo>>();
private PacksackBagMgr()
{
}
@ -63,7 +64,7 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
/// 移除一个工器具或材料
/// </summary>
/// <param name="name"></param>
public bool RemoveOneToolOrMater(ItemInfo itemInfo,ref int count)
public bool RemoveOneToolOrMater(ItemInfo itemInfo, ref int count)
{
if (toolAndMaterialDic.ContainsKey(itemInfo))
{

8
Assets/Scripts/Project/Manager/TooRoomlMannger.cs
View File

@ -4,15 +4,19 @@ using UnityEngine;
public class TooRoomlMannger : MonoBehaviour
{
public BaseToolOrDevice[] allTMDs;
// Start is called before the first frame update
void Start()
{
foreach (var tmd in allTMDs)
{
tmd.GetInfo();
}
}
// Update is called once per frame
void Update()
{
}
}

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

@ -29,7 +29,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
private void Start()
{
_highlight = GetComponent<HighlightEffect>();
GetInfo();
//GetInfo();
}

3
Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs
View File

@ -8,9 +8,10 @@ public class Tool_SelectComponent : BaseToolOrDevice
public override void OnEnter()
{
base.OnEnter();
Vector3 pos = Camera.main.WorldToScreenPoint(transform.position);
GameManager.UIMgr.ShowPanel<ItemTips>(E_UI_Layer.System, (panel) =>
{
panel.Init(gameObject.name);
panel.Init(gameObject.name, pos);
});
///¸ßÁÁ
_highlight.highlighted = true;

5
Assets/Scripts/Project/UI/UI_Panel/ItemTips.cs
View File

@ -4,10 +4,9 @@ using UnityEngine;
public class ItemTips : BasePanel
{
public void Init(string Item)
public void Init(string Item, Vector3 pos)
{
GetControl<TextMeshProUGUI>("ItemText").text = Item;
GetControl<Image>("Bg").rectTransform.sizeDelta = new Vector2(120, 36);
HideMe();
GetComponent<RectTransform>().position = pos;
}
}

3
ProjectSettings/EditorBuildSettings.asset
View File

@ -17,4 +17,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/04_ToolMaterialScene.unity
guid: 77508be314a16b3429c62d70b80826b6
- enabled: 1
path: Assets/Scenes/05_LiveScene.unity
guid: e0f7dee5c18aec247a251231ee88dcfb
m_configObjects: {}