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

Add and remove individual hands #1230

Merged
merged 140 commits into from
Aug 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
89df0fc
allow old view inventory to avoid crashing
stilnat May 18, 2023
8fb1fe2
Add type to slots and resize slots
stilnat May 18, 2023
dedc22a
make divisor a prefab
stilnat May 18, 2023
41d0da0
Add basis for new inventory
stilnat May 18, 2023
dc7ed18
Add new inventory to human and inventory view to canvas
stilnat May 18, 2023
1dda928
Add alternative inventory container
stilnat May 18, 2023
b5ddac6
Make alternative dynamic UI work
stilnat May 18, 2023
ef651bb
remove handsview and put highlight in hands script
stilnat May 18, 2023
5df8b4c
require inventoryalt component
stilnat May 19, 2023
1be9482
fix completely container UI interactions
stilnat May 19, 2023
20a27da
fix everything
stilnat May 19, 2023
9c811d9
separate inventory into inventory and containerviewer
stilnat May 20, 2023
52d5f01
add doc, add method to InventoryView
stilnat May 20, 2023
edd0fc8
adds doc
stilnat May 20, 2023
3e27e7b
rename Inventory to HUmanInventory
stilnat May 20, 2023
d6e0a6d
a bit of decoupling and renaming
stilnat May 20, 2023
ce6acc0
make hands set up after inventory to avoid timing issues
stilnat May 20, 2023
f430c5e
fix weird hand highlight bug
stilnat May 20, 2023
dc459e9
sync loadout
stilnat May 21, 2023
423f753
prefab update with some bugs
stilnat May 21, 2023
51ab7a0
fix slots type and count hand slots
stilnat May 22, 2023
7faa3a2
kinda fix highlight hands colors
stilnat May 22, 2023
eee6eec
remove old hand prefabs
stilnat May 22, 2023
3894c30
add bag slot and fix hand distance
stilnat May 22, 2023
421b623
fix order of slots
stilnat May 22, 2023
34aa0e6
add clothing slots and containers
stilnat May 23, 2023
4d88047
add trucker hat and sunglasses
stilnat May 23, 2023
1e2678a
add cloth displayers for glasses
stilnat May 23, 2023
13a513e
fix a bit some patch
stilnat May 23, 2023
65ee5c1
add hat display
stilnat May 23, 2023
9beee3a
add some doc
stilnat May 23, 2023
6d1909a
factorise some code
stilnat May 24, 2023
8f1af26
fix value in container type to have non overlapping bits
stilnat May 24, 2023
c77a00c
update human prefab
stilnat May 24, 2023
e722cc4
Add some clothes items
stilnat May 25, 2023
ee560f8
make pair slots individual, fix container type
stilnat May 25, 2023
3fadf34
add display for other type of clothes
stilnat May 25, 2023
18328e3
small fix
stilnat May 25, 2023
629e322
add inventory slot container
stilnat Jun 3, 2023
d0c5069
remove useless using
stilnat Jun 3, 2023
039a55e
fix container on jumpsuit
stilnat Jun 3, 2023
5c94846
make slot remove when container removed
stilnat Jun 3, 2023
b32dc0e
add and remove slots and containers in inventory
stilnat Jun 3, 2023
61eaf8e
update hack
stilnat Jun 4, 2023
a87bbaf
fix exception on item display
stilnat Jun 4, 2023
5d30bfa
show item present in slot
stilnat Jun 4, 2023
24cb38c
update human prefab
stilnat Jun 4, 2023
3db44ac
Merge branch 'develop' into rework-inventory-and-clothing
stilnat Jun 4, 2023
da0fcd5
sync clothing display
stilnat Jun 6, 2023
4bf289e
remove warning about parent transform
stilnat Jun 6, 2023
ae386be
allows to remove container in UI of clients
stilnat Jun 8, 2023
fe19521
slightly reduce the mesh bug
stilnat Jun 8, 2023
95988ed
Add bunch of traits for clothing
stilnat Jun 10, 2023
73638df
add backpack item
stilnat Jun 10, 2023
b8cebea
modify a bit slots
stilnat Jun 10, 2023
51ade04
remove separator and improve methods to select slots
stilnat Jun 10, 2023
d4f823f
adding id slot and inventory
stilnat Jun 10, 2023
07f42f7
remove shoes
stilnat Jun 10, 2023
269be08
rename stuff, document HumanInventory
stilnat Jun 10, 2023
9b0cfcf
rename, document inventoryview
stilnat Jun 10, 2023
6ae240c
rename, document containerviewer
stilnat Jun 10, 2023
5a2bbb8
doc an name change in clothesDisplayer
stilnat Jun 10, 2023
9435912
small rename
stilnat Jun 10, 2023
113e49a
Merge branch 'develop' into rework-inventory-and-clothing
stilnat Jun 10, 2023
d57afca
fix build clothes displaying weirdly
stilnat Jun 12, 2023
bdd155e
add support for bag and face mask
stilnat Jun 15, 2023
94778a4
add headset item and support
stilnat Jun 15, 2023
07d3b0e
remove inventory slot
stilnat Jun 22, 2023
532116f
fix hand slots
stilnat Jun 22, 2023
5450711
Revert "remove inventory slot"
stilnat Jun 24, 2023
1cf4606
fix glove left and right
stilnat Jun 24, 2023
87a652e
fix slot position in horizontal layout
stilnat Jun 24, 2023
4f04893
remove inventoryslot container
stilnat Jun 25, 2023
2dcbeb7
only container with display as slot in the UI
stilnat Jun 25, 2023
308b37c
clicking on wrong containers no longer drop item
stilnat Jun 25, 2023
98bf3db
add some doc and tags
stilnat Jun 26, 2023
346134e
Merge branch 'develop' into rework-inventory-and-clothing
stilnat Jul 4, 2023
bbc39d5
PDa is no longer considered clothing
stilnat Jul 6, 2023
7f2ed33
Merge branch 'develop' into rework-inventory-and-clothing
stilnat Jul 13, 2023
e851f44
fixing hand containers from push and fixing PDA container
stilnat Jul 13, 2023
baa9c0b
making containerViewer private
stilnat Jul 13, 2023
6f9945b
change to dynamic list of displayed clothes
stilnat Jul 15, 2023
24c8ff9
partly fix some handling positions
stilnat Jul 15, 2023
12cf44f
fix pda spawning multiple times
stilnat Jul 19, 2023
fdc3eaf
correctly set up viewer only for owner
stilnat Jul 19, 2023
153fdae
remove useless PDA and methods
stilnat Jul 19, 2023
caaa289
move accessor
stilnat Jul 19, 2023
f9227ef
remove inventory container on disabled
stilnat Jul 19, 2023
458ece4
add spawning with clothes
stilnat Jul 22, 2023
567b1b5
fixing forgotten change
stilnat Jul 22, 2023
3151134
update assistant loadout
stilnat Jul 22, 2023
7c29e54
add headset to items, fix loadout
stilnat Jul 22, 2023
aca4c77
fix sec jumpsuit
stilnat Jul 22, 2023
1530d0b
fix return too soon
stilnat Jul 22, 2023
2857222
fix jumpsuit
stilnat Jul 22, 2023
5230acd
fix pocket jumpsuit
stilnat Jul 22, 2023
f4c5c88
add and remove containers methods
stilnat Jul 22, 2023
30ba68d
removing and adding slots now works properly
stilnat Jul 22, 2023
11ad28a
onenable add container
stilnat Jul 22, 2023
8df1eca
fix slot size of items sprite
stilnat Jul 22, 2023
d600289
fixing item missing exceptions
stilnat Jul 23, 2023
511f604
Merge branch 'develop' into rework-inventory-and-clothing
stilnat Jul 26, 2023
322602b
fix grid
stilnat Jul 26, 2023
53501a8
put jumpsuit on item layer
stilnat Jul 26, 2023
8b579e0
clean and doc
stilnat Jul 27, 2023
fc5b444
first commit
stilnat Jul 27, 2023
5293ebc
fix some interaction stuff
stilnat Jul 27, 2023
b0a4ca5
fix pickup interaction
stilnat Jul 27, 2023
a5b5821
fix hands
stilnat Jul 29, 2023
d4d5bd2
add some fix and properly remove hand
stilnat Jul 29, 2023
a3e91ae
some doc
stilnat Jul 29, 2023
f914cb7
more doc
stilnat Jul 29, 2023
63e7e07
Merge branch 'develop' into Individual-hands
stilnat Aug 1, 2023
5c049d1
add assetdatabase for bodyparts
stilnat Aug 3, 2023
89bd406
add hands as items
stilnat Aug 3, 2023
8490022
assetdatabase bodyparts adding follow up
stilnat Aug 3, 2023
ccc7bde
small fix to hands selection
stilnat Aug 3, 2023
c5a77d1
add hand command
stilnat Aug 3, 2023
a21fb88
condition fix
stilnat Aug 3, 2023
68169a8
cleanup and permission check
stilnat Aug 3, 2023
d92e262
add doc
stilnat Aug 10, 2023
4a219d8
fix handcommand
stilnat Aug 10, 2023
59dc8f7
remove useless method in hand command
stilnat Aug 10, 2023
a15101c
Update Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHa…
stilnat Aug 10, 2023
dc33a45
Update Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHa…
stilnat Aug 10, 2023
e29ac73
Update Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHa…
stilnat Aug 10, 2023
2b8cd71
Update Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHa…
stilnat Aug 10, 2023
3da8811
Update Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHa…
stilnat Aug 10, 2023
5429c83
Merge branch 'develop' into Individual-hands
stilnat Aug 10, 2023
f53e777
Merge branch 'develop' into Individual-hands
stilnat Aug 10, 2023
18e4680
rename delegate and event
stilnat Aug 10, 2023
ba625e6
Update Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs
stilnat Aug 10, 2023
24c4f87
Update Assets/Scripts/SS3D/Systems/Inventory/Containers/InventoryView.cs
stilnat Aug 10, 2023
b560677
Update Assets/Scripts/SS3D/Systems/Inventory/Containers/Hand.cs
stilnat Aug 10, 2023
33f0c39
Update Assets/Scripts/SS3D/Systems/IngameConsoleSystem/Commands/AddHa…
stilnat Aug 10, 2023
47b3153
Merge branch 'Individual-hands' of https://github.com/stilnat/SS3D in…
stilnat Aug 10, 2023
1d1fc35
update variables name
stilnat Aug 11, 2023
eb0065e
fix missing ref
stilnat Aug 11, 2023
0385274
fix all interactions
stilnat Aug 11, 2023
bfcdf7d
add a comment to hand file
stilnat Aug 11, 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
1 change: 1 addition & 0 deletions Assets/Content/Addressables/AddressableAssetSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: 8e95016540bf27c4eb11580ec096568a, type: 2}
- {fileID: 11400000, guid: 9bfbc9d4c2c1bb944942108648547da2, type: 2}
- {fileID: 11400000, guid: bacca0c47905ef441803065410c8978e, type: 2}
- {fileID: 11400000, guid: ee54898534212cd4a97b528a9d620c75, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
Expand Down
33 changes: 33 additions & 0 deletions Assets/Content/Addressables/AssetGroups/BodyParts.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: BodyParts
m_EditorClassIdentifier:
m_GroupName: BodyParts
m_Data:
m_SerializedData: []
m_GUID: ff965427dd1889046a3e238d5cb96512
m_SerializeEntries:
- m_GUID: 35dfc7c3f708a5b48a206b4a44e7ab49
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanHandLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: 7f5954f009d06b2439ca637b43920440
m_Address: Assets/Content/WorldObjects/Entities/Humanoids/Human/HumanBodyParts/HumanHandRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 4de7234b6744e474581238ba31893e14, type: 2}
- {fileID: 11400000, guid: 007c51ffa6d371a4aacdc075169132b2, type: 2}
8 changes: 8 additions & 0 deletions Assets/Content/Addressables/AssetGroups/BodyParts.asset.meta

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

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,15 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: a8f988e8c8dd50c4ea7f7f7e5f300082
m_SerializeEntries: []
m_SerializeEntries:
- m_GUID: c19eccca279beee4186432a03257a7b9
m_Address: Assets/Content/WorldObjects/Items/BodyParts/HumanHandRight.prefab
m_ReadOnly: 0
m_SerializedLabels: []
- m_GUID: df85b75fd341a244c8364ebb9c4fcfef
m_Address: Assets/Content/WorldObjects/Items/BodyParts/HumanHandLeft.prefab
m_ReadOnly: 0
m_SerializedLabels: []
m_ReadOnly: 0
m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: BodyParts_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: ee54898534212cd4a97b528a9d620c75, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
m_IncludeGUIDInCatalog: 1
m_IncludeLabelsInCatalog: 1
m_InternalIdNamingMode: 0
m_CacheClearBehavior: 0
m_IncludeInBuild: 1
m_BundledAssetProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
m_ForceUniqueProvider: 0
m_UseAssetBundleCache: 1
m_UseAssetBundleCrc: 1
m_UseAssetBundleCrcForCachedBundles: 1
m_UseUWRForLocalBundles: 0
m_Timeout: 0
m_ChunkedTransfer: 0
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 56790a984472fbe4a809c1ab1b0e4c79
m_LoadPath:
m_Id: 8abc09617b79e8b4994b07cc672cbbe5
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
m_BundleNaming: 0
m_AssetLoadMode: 0

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

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: BodyParts_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: ee54898534212cd4a97b528a9d620c75, type: 2}
m_StaticContent: 0

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

Binary file modified Assets/Content/Addressables/Windows/addressables_content_state.bin
Binary file not shown.
20 changes: 20 additions & 0 deletions Assets/Content/Data/BodyParts.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3c9b6c8ad6324c838c1743c2a2e2abc4, type: 3}
m_Name: BodyParts
m_EditorClassIdentifier:
EnumNamespaceName: SS3D.Data.Enums
EnumName: BodyPartsIds
AssetGroup: {fileID: 11400000, guid: ee54898534212cd4a97b528a9d620c75, type: 2}
Assets:
- {fileID: 5774385816057912484, guid: 35dfc7c3f708a5b48a206b4a44e7ab49, type: 3}
- {fileID: 5774385816057912484, guid: 7f5954f009d06b2439ca637b43920440, type: 3}
8 changes: 8 additions & 0 deletions Assets/Content/Data/BodyParts.asset.meta

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

2 changes: 2 additions & 0 deletions Assets/Content/Data/DefaultPrefabObjects.asset
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ MonoBehaviour:
- {fileID: 6636680625000353110, guid: cc5383d385556f443b2a7d3202f2b2c1, type: 3}
- {fileID: 3227132888119106738, guid: 7bbb74a7ffc8cae44baa886de43c586b, type: 3}
- {fileID: 1871071288925904272, guid: add4d1bc2d874d94782d6b8c912af5e2, type: 3}
- {fileID: 8532088199163376958, guid: df85b75fd341a244c8364ebb9c4fcfef, type: 3}
- {fileID: 8532088199163376958, guid: c19eccca279beee4186432a03257a7b9, type: 3}
- {fileID: 6115335805774105745, guid: bf177f8bab26bc84b87fd9a971004418, type: 3}
- {fileID: 6699414010407460003, guid: f1aeab0a35c29314a8a3f823de9815c1, type: 3}
- {fileID: 4692070367735979832, guid: 8725b7f8f45d28a4ba6063318904cc8a, type: 3}
Expand Down
79 changes: 55 additions & 24 deletions Assets/Content/WorldObjects/Entities/Humanoids/Human/Human.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -6995,7 +6995,9 @@ MonoBehaviour:
- {fileID: 7951212175384182717}
- {fileID: 8320963098858079385}
- {fileID: 4140518851396729342}
- {fileID: 4854640730944196939}
- {fileID: 7144090709710962679}
- {fileID: 4555203962178419925}
<ParentNetworkObject>k__BackingField: {fileID: 0}
<ChildNetworkObjects>k__BackingField:
- {fileID: 4138789318277530234}
Expand Down Expand Up @@ -7275,16 +7277,12 @@ MonoBehaviour:
_componentIndexCache: 9
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
HandContainers:
- {fileID: 4140518851396729342}
- {fileID: 7144090709710962679}
handRange: 5
SelectedColor: {r: 1, g: 0.9764151, b: 0.9764151, a: 0.8509804}
range:
Horizontal: 1.5
Vertical: 2
interactionOrigin: {fileID: 5927494552340417975}
pickupIcon: {fileID: 21300000, guid: d1f34343e08a14e48a856e409c355f32, type: 3}
PlayerHands:
- {fileID: 4854640730944196939}
- {fileID: 4555203962178419925}
_selectedColor: {r: 1, g: 1, b: 1, a: 0.8627451}
_defaultColor: {r: 1, g: 1, b: 1, a: 0.45490196}
_selectedHand: {fileID: 0}
--- !u!114 &7934531206375951864
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7404,19 +7402,6 @@ MonoBehaviour:
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_inventory: {fileID: 1089183168752255729}
ClothesRoot: {fileID: 1870850359086752095}
startingClothedBodyPart:
- {fileID: 7590913349156985469}
- {fileID: 8410791339138828931}
- {fileID: 4138789318277530234}
- {fileID: 6233962219268866637}
- {fileID: 8067289659534850981}
- {fileID: 6911900315559804093}
- {fileID: 8626656600768578774}
- {fileID: 4684017524585288931}
- {fileID: 2091115627957921416}
- {fileID: 7534105608452820685}
- {fileID: 1527032890679831709}
--- !u!114 &4559920193704007786
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -9998,6 +9983,7 @@ GameObject:
- component: {fileID: 1342008326084027676}
- component: {fileID: 4140518851396729342}
- component: {fileID: 8300769832796282301}
- component: {fileID: 4854640730944196939}
m_Layer: 0
m_Name: hold.l
m_TagString: Untagged
Expand Down Expand Up @@ -10073,6 +10059,28 @@ MonoBehaviour:
m_EditorClassIdentifier:
attachedContainer: {fileID: 4140518851396729342}
Mirrored: 1
--- !u!114 &4854640730944196939
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8915899267794646267}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e60c09e136263a44eb7996c9a5dc742a, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 38
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
Container: {fileID: 4140518851396729342}
_range:
Horizontal: 1.5
Vertical: 2
_pickupIcon: {fileID: 21300000, guid: d1f34343e08a14e48a856e409c355f32, type: 3}
_interactionOrigin: {fileID: 1342008326084027676}
HandsController: {fileID: 2150560678942863610}
--- !u!1 &8935913803077858714
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -10294,6 +10302,7 @@ GameObject:
- component: {fileID: 6653541696833174003}
- component: {fileID: 7144090709710962679}
- component: {fileID: 8735509741792839302}
- component: {fileID: 4555203962178419925}
m_Layer: 0
m_Name: hold.r
m_TagString: Untagged
Expand Down Expand Up @@ -10328,7 +10337,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 25696236470760b41b375e9b6939444c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 38
_componentIndexCache: 39
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
_automaticContainerSetUp: 0
Expand Down Expand Up @@ -10369,6 +10378,28 @@ MonoBehaviour:
m_EditorClassIdentifier:
attachedContainer: {fileID: 7144090709710962679}
Mirrored: 0
--- !u!114 &4555203962178419925
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9064888651365615274}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e60c09e136263a44eb7996c9a5dc742a, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 40
_addedNetworkObject: {fileID: 2930813178971533500}
_networkObjectCache: {fileID: 2930813178971533500}
Container: {fileID: 7144090709710962679}
_range:
Horizontal: 1.5
Vertical: 2
_pickupIcon: {fileID: 21300000, guid: 2db953f2ae8f41d4e9842d9144a9e396, type: 2}
_interactionOrigin: {fileID: 6653541696833174003}
HandsController: {fileID: 2150560678942863610}
--- !u!1 &9131769810566877388
GameObject:
m_ObjectHideFlags: 0
Expand Down
Loading
Loading