Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding tool belt #1349

Merged
merged 28 commits into from
Dec 2, 2023
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4fb4e82
Add belt container and slot
stilnat Nov 20, 2023
133a374
add toolbelt item
stilnat Nov 20, 2023
91d8707
put toolbelt on
stilnat Nov 20, 2023
b50e10e
add storage conditions
stilnat Nov 21, 2023
c8e2f4e
add storage condition components
stilnat Nov 21, 2023
0dcb855
Merge branch 'develop' into adding-belt
stilnat Nov 23, 2023
0e10dca
try to fix assets stuff
stilnat Nov 23, 2023
5f15462
remove body part database
stilnat Nov 23, 2023
193ce48
fix merge issues
stilnat Nov 23, 2023
4e4826e
readd toolbelt
stilnat Nov 23, 2023
ac9d788
some set up on human prefab
stilnat Nov 24, 2023
d78e9bb
add storage condition in can contain on attached containers
stilnat Nov 24, 2023
829b168
doc
stilnat Nov 24, 2023
61dca75
fix build
stilnat Nov 24, 2023
891b609
put toolbelt on item layer
stilnat Nov 24, 2023
1cf3bb3
update slot size
stilnat Nov 26, 2023
115b915
simplify container stuff
stilnat Nov 27, 2023
d807d58
simplify checks
stilnat Nov 27, 2023
fc31ce8
add transfer item method
stilnat Nov 27, 2023
dd63dfc
renamed clothes folder to clothing and moving backpack and toolbelt i…
stilnat Nov 27, 2023
32795ec
remove old toolbelt
stilnat Nov 28, 2023
0b723c4
readd toolbelt to database
stilnat Nov 29, 2023
fb6640d
fix toolbelt asset
stilnat Nov 29, 2023
c86af32
fix item prefabs
stilnat Nov 29, 2023
cb7cb60
added some condition regarding removing items using UI
stilnat Nov 29, 2023
20ac48e
add backpack back
stilnat Nov 29, 2023
c76f81e
Merge branch 'develop' into adding-belt
stilnat Dec 2, 2023
68302d6
fix merge stuff
stilnat Dec 2, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add belt container and slot
stilnat committed Nov 20, 2023
commit 4fb4e8292baa5d2788f7e9589e72f7ae02bf6610
6 changes: 5 additions & 1 deletion Assets/Content/Scenes/Game.unity
Original file line number Diff line number Diff line change
@@ -1384,7 +1384,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4468402021075485018, guid: cc5383d385556f443b2a7d3202f2b2c1, type: 3}
propertyPath: m_AnchoredPosition.y
value: -230.00003
value: -230
objectReference: {fileID: 0}
- target: {fileID: 4468402021449001342, guid: cc5383d385556f443b2a7d3202f2b2c1, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -2763,6 +2763,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2527545844909297779, guid: df2268f4f5f6669459174c6d7e2043ce, type: 3}
propertyPath: ClothingSlotPosition.Array.size
value: 11
objectReference: {fileID: 0}
- target: {fileID: 2779748697144886346, guid: df2268f4f5f6669459174c6d7e2043ce, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Original file line number Diff line number Diff line change
@@ -176,7 +176,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a8609ee7f492f8e44bb25beb1eee6697, type: 3}
m_Name:
m_EditorClassIdentifier:
containerViewer: {fileID: 0}
ContainerUiPrefab: {fileID: 176838957447208628, guid: c706a5a7a16b7bc4788469385ac24801, type: 3}
--- !u!114 &4416089188971054470
MonoBehaviour:
@@ -197,7 +196,7 @@ MonoBehaviour:
HandRightPrefab: {fileID: 6293962685997774382, guid: aca25d317b84e5c43afafc9832b4df8d, type: 3}
BagPrefab: {fileID: 3969695133087941026, guid: 98867721229cea84eb087210f54475e0, type: 3}
Divisor: {fileID: 6527856439637363361, guid: 823c4c1392e36034fab7fd8e1a1ed147, type: 3}
HorizontalSlotOrder: 08000000040000000200000001000000
HorizontalSlotOrder: 0800000000800000040000000200000001000000
ClothingLayout: {fileID: 4392532013381623832}
ShoeLeftPrefab: {fileID: 8668479097449726212, guid: 6d2fdfb2988c7304587777d34f496d5b, type: 3}
ShoeRightPrefab: {fileID: 8736263994919197959, guid: 2054b7b0321d0924981d1c07015b086d, type: 3}
@@ -208,10 +207,11 @@ MonoBehaviour:
HeadPrefab: {fileID: 8584173595202467535, guid: 113d454c18a13854b87605d0ee9c73a6, type: 3}
JumpsuitPrefab: {fileID: 5988165263683014854, guid: 4bb39a802a283d341a20c566474368ae, type: 3}
ExoSuitPrefab: {fileID: 6837100192917222649, guid: 7213f8ade5a231544997e1def361efaa, type: 3}
DummyPrefab: {fileID: 3933365585080000025, guid: 4d43e2768b3c98f47bcb46c541146e0a, type: 3}
EarLeftPrefab: {fileID: 1102191780216136002, guid: 7fba0b2cc13002b4da9b264a030ce7d8, type: 3}
EarRightPrefab: {fileID: 6702060473300478753, guid: 2b52bcb3e287ce1468a7f69caa576557, type: 3}
ClothingSlotPosition: 002000000001000000400000400000008000000000000000001000000002000000080000000000001000000020000000
BeltPrefab: {fileID: 6161546706607067415, guid: 7c614d478e3f2c84288321617f283dfb, type: 3}
DummyPrefab: {fileID: 3933365585080000025, guid: 4d43e2768b3c98f47bcb46c541146e0a, type: 3}
ClothingSlotPosition: 002000000001000000400000400000008000000000000000001000000002000000080000100000002000000020000000
--- !u!1 &9219927822186948004
GameObject:
m_ObjectHideFlags: 0
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &7665152052123555536
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 891493521659593609, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: ContainerType
value: 32768
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_SizeDelta.x
value: 55
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_SizeDelta.y
value: 55
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134918, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4603278309003134919, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_Name
value: BeltSlot
objectReference: {fileID: 0}
- target: {fileID: 4603278309205153379, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b39932adf71ab734aabebaab0412954f, type: 3}
- target: {fileID: 4603278309862412043, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b39932adf71ab734aabebaab0412954f, type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: aaedbf68381c7904e8810641d76f7a2b, type: 3}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

138 changes: 111 additions & 27 deletions Assets/Content/WorldObjects/Entities/Humanoids/Human/Human.prefab
Original file line number Diff line number Diff line change
@@ -1671,7 +1671,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 57
_componentIndexCache: 58
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 1
@@ -2001,7 +2001,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 59
_componentIndexCache: 60
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 1
@@ -2402,7 +2402,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 41
_componentIndexCache: 42
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 1
@@ -2439,7 +2439,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 87fb11738474538428e7ab7a2732a1bb, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 42
_componentIndexCache: 43
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_parentBodyPart: {fileID: 6956777571749741975}
@@ -2576,7 +2576,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 80e876a9101cc6042b1b5a1fbf89b810, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 43
_componentIndexCache: 44
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_bodyPart: {fileID: 4041160852756243419}
@@ -3551,7 +3551,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 64
_componentIndexCache: 65
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -4381,7 +4381,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 55
_componentIndexCache: 56
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -4634,7 +4634,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 67
_componentIndexCache: 68
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -5778,7 +5778,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 58
_componentIndexCache: 59
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 1
@@ -7324,7 +7324,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 44
_componentIndexCache: 45
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 1
@@ -7361,7 +7361,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 87fb11738474538428e7ab7a2732a1bb, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 45
_componentIndexCache: 46
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_parentBodyPart: {fileID: 6206108594876145282}
@@ -7498,7 +7498,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 80e876a9101cc6042b1b5a1fbf89b810, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 46
_componentIndexCache: 47
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_bodyPart: {fileID: 2329251983725585613}
@@ -8509,7 +8509,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 66
_componentIndexCache: 67
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -8844,7 +8844,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 65
_componentIndexCache: 66
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -8994,6 +8994,7 @@ MonoBehaviour:
- {fileID: 1082206991310670826}
- {fileID: 5460457101901443602}
- {fileID: 7584683726852713205}
- {fileID: 9047513397440941168}
- {fileID: 2306112832503890745}
- {fileID: 4041160852756243419}
- {fileID: 1771436799082289863}
@@ -9538,6 +9539,7 @@ Transform:
- {fileID: 4169942637441476752}
- {fileID: 4531842478586200051}
- {fileID: 8674961287379602231}
- {fileID: 1197393981893597262}
m_Father: {fileID: 498654123859477456}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9751,6 +9753,88 @@ Transform:
m_Father: {fileID: 498654123859477456}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6657284224946127033
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1197393981893597262}
- component: {fileID: 9047513397440941168}
- component: {fileID: 43029435639503373}
m_Layer: 12
m_Name: BeltContainer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1197393981893597262
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6657284224946127033}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6806139853968569792}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9047513397440941168
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6657284224946127033}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 41
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 1
ContainerInteractive: {fileID: 0}
ContainerItemDisplay: {fileID: 0}
ContainerUi: {fileID: 0}
_attachmentOffset: {x: 0, y: 0, z: 0}
_onlyStoreWhenOpen: 0
_openWhenContainerViewed: 0
_attachItems: 1
_initialized: 1
_maxDistance: 5
_isOpenable: 0
_isInteractive: 0
_hasUi: 0
_hasCustomInteraction: 0
_hasCustomDisplay: 0
_displays: []
_numberDisplay: 0
_displayAsSlotInUI: 1
_size: {x: 1, y: 1}
_hideItems: 1
_type: 32768
_startFilter: {fileID: 0}
--- !u!114 &43029435639503373
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6657284224946127033}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a19f823e20acab740ba5150747863eb9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6697434752520298150
GameObject:
m_ObjectHideFlags: 0
@@ -10187,7 +10271,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 63
_componentIndexCache: 64
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -10890,7 +10974,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 61
_componentIndexCache: 62
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -11376,7 +11460,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 83a3281d5348d93498a0d8d0e3b7751d, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 47
_componentIndexCache: 48
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_parentBodyPart: {fileID: 1082974716090020341}
@@ -11399,7 +11483,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 48
_componentIndexCache: 49
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 0
@@ -11437,7 +11521,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e60c09e136263a44eb7996c9a5dc742a, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 49
_componentIndexCache: 50
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
Container: {fileID: 2877804502633151377}
@@ -11485,7 +11569,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 80e876a9101cc6042b1b5a1fbf89b810, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 50
_componentIndexCache: 51
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_bodyPart: {fileID: 2124807441123396136}
@@ -11535,7 +11619,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 60
_componentIndexCache: 61
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 1
@@ -11709,7 +11793,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 56
_componentIndexCache: 57
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -13158,7 +13242,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 62
_componentIndexCache: 63
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_componentConfiguration: 0
@@ -13345,7 +13429,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 83a3281d5348d93498a0d8d0e3b7751d, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 51
_componentIndexCache: 52
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_parentBodyPart: {fileID: 465916857022110443}
@@ -13368,7 +13452,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 52
_componentIndexCache: 53
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 0
@@ -13420,7 +13504,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e60c09e136263a44eb7996c9a5dc742a, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 53
_componentIndexCache: 54
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
Container: {fileID: 8825455644555575778}
@@ -13454,7 +13538,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 80e876a9101cc6042b1b5a1fbf89b810, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 54
_componentIndexCache: 55
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_bodyPart: {fileID: 9049119147086013476}
3 changes: 3 additions & 0 deletions Assets/DefaultPrefabObjects.asset
Original file line number Diff line number Diff line change
@@ -94,6 +94,7 @@ MonoBehaviour:
- {fileID: 1019513474262773944, guid: 06c946c7c639138488b814e4448b82e4, type: 3}
- {fileID: -9151722837240714421, guid: 41d7af24659a0d3439668aeb4c46d9bc, type: 3}
- {fileID: 8320282919264059031, guid: 8ae2f499d25bfcd41bf26b735c852ab1, type: 3}
- {fileID: 8031370004641457100, guid: 85fa4c9b76b4b23458dcf24a745a1dfe, type: 3}
- {fileID: 8095612838085175437, guid: 5a09b3e93f0022b468da150e3c4a78c6, type: 3}
- {fileID: -6797522191161373784, guid: 11d64ed349b96ec4780c4dda0ad89daf, type: 3}
- {fileID: -5414623717715724467, guid: 7b74e45100446b440b4b0a12cd6d05ef, type: 3}
@@ -151,6 +152,8 @@ MonoBehaviour:
- {fileID: 8532088199163376958, guid: 2bc6f6a968d5ba04c919ba56d0ccdab4, type: 3}
- {fileID: 354436423397270740, guid: 7a895b269e3f67241af148d25331f5af, type: 3}
- {fileID: 5640352947892099654, guid: 4a1bd08646e8e1f4a861960d9b7485f8, type: 3}
- {fileID: -9158575437637332483, guid: e9009aff81f29eb429148fd71961539f, type: 3}
- {fileID: -908405258838932631, guid: 672b544ba53de0144aab307a16b085cb, type: 3}
- {fileID: 6244957436306937818, guid: 4d48472d06930bd42a15897e6a1794ac, type: 3}
- {fileID: 5716146803221059512, guid: ebddb1721dcbe36499e4d093e5a7ff09, type: 3}
- {fileID: 8635336608555116780, guid: 6caa99f8281726e40a793826d5c047db, type: 3}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

@@ -27,6 +27,7 @@ public enum ContainerType
GloveRight = 1 << 12,
EarLeft = 1 << 13,
EarRight = 1 << 14,
Belt = 1 << 15,
}
}

Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ public class InventoryView : View
[SerializeField] private GameObject HandLeftPrefab;
[SerializeField] private GameObject HandRightPrefab;
[SerializeField] private GameObject BagPrefab;
[SerializeField] private GameObject BeltPrefab;
[SerializeField] private GameObject Divisor;

/// <summary>
@@ -56,6 +57,7 @@ public class InventoryView : View
[SerializeField] private GameObject EarRightPrefab;
[SerializeField] private GameObject DummyPrefab;


private object lockObject = new object();

/// <summary>
@@ -181,6 +183,11 @@ private void HandleInventoryContainerAdded(AttachedContainer container)
slot = AddClothingSlot(ShoeRightPrefab);
break;

case ContainerType.Belt:
slot = AddHorizontalLayoutSlot(BeltPrefab, ContainerType.Belt);
break;


default:
Log.Error(this, $"Unknown or missing container type {container.Type} for this container {container}");
slot = null;