RE-SS3D · iamteapot422 · Aug 12, 2023 · May 18, 2023 · May 18, 2023 · May 18, 2023
diff --git a/Assets/Content/Addressables/AddressableAssetSettings.asset b/Assets/Content/Addressables/AddressableAssetSettings.asset
@@ -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

diff --git a/Assets/Content/Addressables/AssetGroups/BodyParts.asset b/Assets/Content/Addressables/AssetGroups/BodyParts.asset
@@ -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}
diff --git a/Assets/Content/Addressables/AssetGroups/BodyParts.asset.meta b/Assets/Content/Addressables/AssetGroups/BodyParts.asset.meta
diff --git a/Assets/Content/Addressables/AssetGroups/Default Local Group.asset b/Assets/Content/Addressables/AssetGroups/Default Local Group.asset
@@ -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:

diff --git a/Assets/Content/Addressables/AssetGroups/Schemas/BodyParts_BundledAssetGroupSchema.asset b/Assets/Content/Addressables/AssetGroups/Schemas/BodyParts_BundledAssetGroupSchema.asset
@@ -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
diff --git a/Assets/Content/Addressables/AssetGroups/Schemas/BodyParts_BundledAssetGroupSchema.asset.meta b/Assets/Content/Addressables/AssetGroups/Schemas/BodyParts_BundledAssetGroupSchema.asset.meta
diff --git a/Assets/Content/Addressables/AssetGroups/Schemas/BodyParts_ContentUpdateGroupSchema.asset b/Assets/Content/Addressables/AssetGroups/Schemas/BodyParts_ContentUpdateGroupSchema.asset
@@ -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
diff --git a/...ts/Content/Addressables/AssetGroups/Schemas/BodyParts_ContentUpdateGroupSchema.asset.meta b/...ts/Content/Addressables/AssetGroups/Schemas/BodyParts_ContentUpdateGroupSchema.asset.meta
diff --git a/Assets/Content/Addressables/Windows/addressables_content_state.bin b/Assets/Content/Addressables/Windows/addressables_content_state.bin
diff --git a/Assets/Content/Data/BodyParts.asset b/Assets/Content/Data/BodyParts.asset
@@ -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}
diff --git a/Assets/Content/Data/BodyParts.asset.meta b/Assets/Content/Data/BodyParts.asset.meta
diff --git a/Assets/Content/Data/DefaultPrefabObjects.asset b/Assets/Content/Data/DefaultPrefabObjects.asset
@@ -13,12 +13,17 @@ MonoBehaviour:
   m_Name: DefaultPrefabObjects
   m_EditorClassIdentifier: 
   _prefabs:
+  - {fileID: 6020083413388562179, guid: dfcd83503e242c843a6bc43cc5040fc9, type: 3}
   - {fileID: 5177941338532333075, guid: 6deac385bf663034fa7d8dece88c07bb, type: 3}
+  - {fileID: 7875182825432581152, guid: ad573dedc3cb2d74fa42bedc463ffd75, type: 3}
+  - {fileID: 1962741444460096580, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3}
   - {fileID: 562230263738288595, guid: 06a27ffa07c1c754c9590607a5a80030, type: 3}
   - {fileID: 562230263738288595, guid: 59f05e8a3a1d4b94eb5222aed605e260, type: 3}
   - {fileID: 8203177977882359099, guid: 6ab4ce7059d374a4498481e1385c222e, 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}
@@ -62,6 +67,7 @@ MonoBehaviour:
   - {fileID: -7727686409064562107, guid: 05582ec649a27b64c85729877d9e344d, type: 3}
   - {fileID: -7727686409064562107, guid: d211f90919bc28a4e8def76cb07197ba, type: 3}
   - {fileID: 3206407796921847736, guid: 3335d001fdfff824aa859b98f2fe564e, type: 3}
+  - {fileID: 4302234173120300195, guid: 313c7a6f7eaaf4f4cb80cbe0fe77005d, type: 3}
   - {fileID: 9154675693299657064, guid: af039f84b4a245049b5b62799af01384, type: 3}
   - {fileID: 2930813178971533500, guid: 1c3eed1ea37ecc1448e41270cdc63486, type: 3}
   - {fileID: 1019513474262773944, guid: 06c946c7c639138488b814e4448b82e4, type: 3}
@@ -75,6 +81,11 @@ MonoBehaviour:
   - {fileID: 3258417366846669140, guid: 330d85a67a5891145bd8037dde90f37b, type: 3}
   - {fileID: 3258417366846669140, guid: dd3ce5340ed4aba4babae7020f737084, type: 3}
   - {fileID: 4819234911439508660, guid: 11f824c472e04854e95065dda095e8f4, type: 3}
+  - {fileID: 6348062478285535548, guid: 1d2cf546d53e3fe4c9103007427aaec7, type: 3}
+  - {fileID: 8767567404870203102, guid: 404443f7c306fc8469698745624fa3bf, type: 3}
+  - {fileID: 1491149956516498634, guid: b044d7bdb55405046a9055726a779eb1, type: 3}
+  - {fileID: 4037338737721612837, guid: f88a398ad3d01454f955de9c337d9b99, type: 3}
+  - {fileID: 1773710978803455870, guid: 4cb99cf2fee96f944abbacc51b0b701c, type: 3}
   - {fileID: -1308347259443233487, guid: 821d0946be816bb42a0eed24631d57ee, type: 3}
   - {fileID: 3815592008771065855, guid: 8686fbdb413e33b4395a775c4f2ba990, type: 3}
   - {fileID: -7727686409064562107, guid: de6f06ad18d50134295959f438ba9c5d, type: 3}
@@ -111,6 +122,7 @@ MonoBehaviour:
   - {fileID: 8635336608555116780, guid: 6caa99f8281726e40a793826d5c047db, type: 3}
   - {fileID: 9015187684533357890, guid: 5e8a02c5ce0073644ac01bdb55d72a70, type: 3}
   - {fileID: -2900402353996906960, guid: b5be0a52925e2674193d081d2deb68cb, type: 3}
+  - {fileID: 885347571389710399, guid: 162e188d33a82b440a239f20901c716a, type: 3}
   - {fileID: 881130758709618923, guid: 2332a158259900e4f8a237fa8daff266, type: 3}
   - {fileID: 7958861831329766982, guid: d8b0c8d1ddcdeb24d9763054c103c9fe, type: 3}
   - {fileID: 7958861831329766982, guid: 79260483ae5d3e04fa272e092b49abac, type: 3}
@@ -119,6 +131,11 @@ MonoBehaviour:
   - {fileID: 2090837846029440516, guid: 3520c433beff78a478401074d2ca95a3, type: 3}
   - {fileID: 7958861831329766982, guid: d9aabfd5d726a7f499b8e360d919eba4, type: 3}
   - {fileID: 4819234911439508660, guid: 1ae18785d74e9fa4699b6f6de889c243, type: 3}
+  - {fileID: 6294647206769462932, guid: 7becfab153276864f9fc7636a839d837, type: 3}
+  - {fileID: 1602098408367427586, guid: 9c8363ee7f934bd4b8ee5a2e30da1269, type: 3}
+  - {fileID: 4052990814619214022, guid: 772da386eb7b01745913050fee544c32, type: 3}
+  - {fileID: 7970185317444620997, guid: 781dd9024aaa53444bc3deeaa9708fbb, type: 3}
+  - {fileID: 261983550380735922, guid: 411b513efc8f06a40aecfc47d0c5fc5a, type: 3}
   - {fileID: 6999522401175031449, guid: 9b8a1328991fc2846bc55a3d9a82e5c0, type: 3}
   - {fileID: 1330758276423851772, guid: 0ef9cea3bb74e6c4788f77e711f92d4d, type: 3}
   - {fileID: -7180308641962958576, guid: 501391c27a7f94c4d8c937f00a9ceb9f, type: 3}

diff --git a/Assets/Content/WorldObjects/Entities/Humanoids/Human/Human.prefab b/Assets/Content/WorldObjects/Entities/Humanoids/Human/Human.prefab
@@ -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}
@@ -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
@@ -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
@@ -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
@@ -10073,6 +10059,29 @@ 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}
+  handRange: 3
+  range:
+    Horizontal: 1.5
+    Vertical: 2
+  pickupIcon: {fileID: 0}
+  interactionOrigin: {fileID: 1342008326084027676}
+  handsController: {fileID: 0}
 --- !u!1 &8935913803077858714
 GameObject:
   m_ObjectHideFlags: 0
@@ -10294,6 +10303,7 @@ GameObject:
   - component: {fileID: 6653541696833174003}
   - component: {fileID: 7144090709710962679}
   - component: {fileID: 8735509741792839302}
+  - component: {fileID: 4555203962178419925}
   m_Layer: 0
   m_Name: hold.r
   m_TagString: Untagged
@@ -10328,7 +10338,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
@@ -10369,6 +10379,29 @@ 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}
+  handRange: 3
+  range:
+    Horizontal: 1.5
+    Vertical: 2
+  pickupIcon: {fileID: 0}
+  interactionOrigin: {fileID: 6653541696833174003}
+  handsController: {fileID: 0}
 --- !u!1 &9131769810566877388
 GameObject:
   m_ObjectHideFlags: 0