-
-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Inventory Rework and clothing (#1215)
* allow old view inventory to avoid crashing * Add type to slots and resize slots * make divisor a prefab * Add basis for new inventory * Add new inventory to human and inventory view to canvas * Add alternative inventory container * Make alternative dynamic UI work * remove handsview and put highlight in hands script * require inventoryalt component * fix completely container UI interactions * fix everything * separate inventory into inventory and containerviewer this alleviates a bit the role of the inventory. Inventory should only handles what's on the player or hold by them. Opened Containers by the player should be displayed using another script, dedicated to that. * add doc, add method to InventoryView * adds doc * rename Inventory to HUmanInventory this prevents the conflit with Inventory namespace * a bit of decoupling and renaming * make hands set up after inventory to avoid timing issues * fix weird hand highlight bug * sync loadout * prefab update with some bugs * fix slots type and count hand slots * kinda fix highlight hands colors * remove old hand prefabs * add bag slot and fix hand distance * fix order of slots * add clothing slots and containers * add trucker hat and sunglasses * add cloth displayers for glasses * fix a bit some patch * add hat display * add some doc * factorise some code * fix value in container type to have non overlapping bits * update human prefab * Add some clothes items * make pair slots individual, fix container type * add display for other type of clothes * small fix * add inventory slot container * remove useless using * fix container on jumpsuit * make slot remove when container removed * add and remove slots and containers in inventory * update hack * fix exception on item display * show item present in slot * update human prefab * sync clothing display * remove warning about parent transform * allows to remove container in UI of clients * slightly reduce the mesh bug * Add bunch of traits for clothing * add backpack item * modify a bit slots * remove separator and improve methods to select slots * adding id slot and inventory * remove shoes * rename stuff, document HumanInventory * rename, document inventoryview * rename, document containerviewer * doc an name change in clothesDisplayer * small rename * fix build clothes displaying weirdly * add support for bag and face mask * add headset item and support * remove inventory slot * fix hand slots * Revert "remove inventory slot" This reverts commit 07d3b0e. * fix glove left and right * fix slot position in horizontal layout * remove inventoryslot container * only container with display as slot in the UI * clicking on wrong containers no longer drop item * add some doc and tags * PDa is no longer considered clothing * fixing hand containers from push and fixing PDA container * making containerViewer private * change to dynamic list of displayed clothes * partly fix some handling positions * fix pda spawning multiple times * correctly set up viewer only for owner * remove useless PDA and methods * move accessor * remove inventory container on disabled * add spawning with clothes * fixing forgotten change * update assistant loadout * add headset to items, fix loadout * fix sec jumpsuit * fix return too soon * fix jumpsuit * fix pocket jumpsuit * add and remove containers methods * removing and adding slots now works properly When a gameobject container is disabled and was part of the inventory, the container slot linked to it disappear. Similar when adding a container. * onenable add container * fix slot size of items sprite * fixing item missing exceptions * fix grid * put jumpsuit on item layer * clean and doc
- Loading branch information
Showing
234 changed files
with
13,617 additions
and
4,349 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+0 Bytes
(100%)
Assets/Content/Addressables/Windows/addressables_content_state.bin
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: 0adc192349dc57848b5394a2c6707c23, type: 3} | ||
| m_Name: EarLeft | ||
| m_EditorClassIdentifier: | ||
| mustHaveAll: 0 | ||
| acceptedTraits: | ||
| - {fileID: 11400000, guid: ebb958676aabcb647b8d1b51b1ed8098, type: 2} | ||
| deniedTraits: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: 0adc192349dc57848b5394a2c6707c23, type: 3} | ||
| m_Name: EarRight | ||
| m_EditorClassIdentifier: | ||
| mustHaveAll: 0 | ||
| acceptedTraits: | ||
| - {fileID: 11400000, guid: 5f051f2619c7c6a41938d7c2ac95c921, type: 2} | ||
| deniedTraits: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: 0adc192349dc57848b5394a2c6707c23, type: 3} | ||
| m_Name: Eyes | ||
| m_EditorClassIdentifier: | ||
| mustHaveAll: 0 | ||
| acceptedTraits: | ||
| - {fileID: 11400000, guid: aad6862af822986498365c59cf83067a, type: 2} | ||
| deniedTraits: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: 0adc192349dc57848b5394a2c6707c23, type: 3} | ||
| m_Name: Face | ||
| m_EditorClassIdentifier: | ||
| mustHaveAll: 0 | ||
| acceptedTraits: | ||
| - {fileID: 11400000, guid: 6169d80297e73ad44b394b52547ac805, type: 2} | ||
| deniedTraits: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: 0adc192349dc57848b5394a2c6707c23, type: 3} | ||
| m_Name: HandLeft | ||
| m_EditorClassIdentifier: | ||
| mustHaveAll: 0 | ||
| acceptedTraits: | ||
| - {fileID: 11400000, guid: 901be8d20f1f0f24181cc992dfd362ae, type: 2} | ||
| deniedTraits: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: 0adc192349dc57848b5394a2c6707c23, type: 3} | ||
| m_Name: HandRight | ||
| m_EditorClassIdentifier: | ||
| mustHaveAll: 0 | ||
| acceptedTraits: | ||
| - {fileID: 11400000, guid: 6dc4b6b828749aa49aa1f52e147f2003, type: 2} | ||
| deniedTraits: [] |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| %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: 0adc192349dc57848b5394a2c6707c23, type: 3} | ||
| m_Name: Hat | ||
| m_EditorClassIdentifier: | ||
| mustHaveAll: 0 | ||
| acceptedTraits: | ||
| - {fileID: 11400000, guid: 4fd47d47c95ea9d4bbfa168e63538ba1, type: 2} | ||
| deniedTraits: [] |
Oops, something went wrong.