Merge branch 'develop' into Animations

RE-SS3D · Sep 9, 2024 · a505dd0 · a505dd0
2 parents f43d9f2 + 0dae360
commit a505dd0
Show file tree

Hide file tree

Showing 457 changed files with 23,828 additions and 750 deletions.
diff --git a/Assets/Content/Addressables/AssetGroups/CraftingRecipes.asset b/Assets/Content/Addressables/AssetGroups/CraftingRecipes.asset
@@ -17,14 +17,30 @@ MonoBehaviour:
     m_SerializedData: []
   m_GUID: 32ec404d3166dea4b8246e46ce1581b0
   m_SerializeEntries:
-  - m_GUID: 5dafa9029944cdc448a9e1d6d67e438f
-    m_Address: Assets/Content/Data/Recipes/SlicedBananas.asset
-    m_ReadOnly: 0
-    m_SerializedLabels: []
   - m_GUID: 5069902a314070f4ca869692cbc791fa
     m_Address: Assets/Content/Data/Recipes/WeirdComplexRecipe.asset
     m_ReadOnly: 0
     m_SerializedLabels: []
+  - m_GUID: 41ed3a9a199817b47b7ba22ecb7c1ab4
+    m_Address: Assets/Content/Data/Recipes/SteelGirderUnboltedRecipe.asset
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: b7f1e5d68b05f6743a606736245ff481
+    m_Address: Assets/Content/Data/Recipes/SteelSheetRecipe.asset
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 115e1db3f2858c14fa6b736f67e552be
+    m_Address: Assets/Content/Data/Recipes/ReinforcedWallRecipe.asset
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 3d6dc37a96797e442bafcb066f1f9aef
+    m_Address: Assets/Content/Data/Recipes/SteelWallRecipe.asset
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 3decef2c351e13b4194d1994c485a170
+    m_Address: Assets/Content/Data/Recipes/SteelGirderRecipe.asset
+    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/Items.asset b/Assets/Content/Addressables/AssetGroups/Items.asset
@@ -285,6 +285,22 @@ MonoBehaviour:
     m_Address: Assets/Content/WorldObjects/Items/Functional/Parts/PowerCells/PowerCell.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
+  - m_GUID: 45d13347efae0f54882e0e56dd770bb1
+    m_Address: Assets/Content/WorldObjects/Structures/Walls/SteelWall.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 6c2559c2017ada740b245951a23c2e1d
+    m_Address: Assets/Content/WorldObjects/Structures/Walls/SteelGirder.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 3b33b5cf16a677a4e85a110679cde32a
+    m_Address: Assets/Content/WorldObjects/Structures/Floors/Plenum.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: 5dba4171f2124fb48b0e32c0e10841e0
+    m_Address: Assets/Content/WorldObjects/Structures/Walls/SteelGirderUnbolted.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
   - m_GUID: a1a7407e08bb2914c97f431063bf83e2
     m_Address: Assets/Content/WorldObjects/Items/Functional/Materials/GlassSheetReinforced.prefab
     m_ReadOnly: 0
@@ -369,6 +385,16 @@ MonoBehaviour:
     m_Address: Assets/Content/WorldObjects/Items/Functional/Materials/ElectricalCable.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
+  - m_GUID: b9c224febb4233f4e912745553097652
+    m_Address: Assets/Content/WorldObjects/Structures/Walls/SteelWindow.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: abcc60752234e584d8d98c9dec03e7cc
+    m_Address: Assets/Content/WorldObjects/Structures/Walls/SteelWallReinforced.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+  - m_GUID: f2493b5478dd8e946ba98861f533362e
+    m_Address: Assets/Content/WorldObjects/Structures/Walls/SteelWindowReinforced.prefab
   - m_GUID: 88d1ba1edb4ce5e4fa74c6a8d53e36e1
     m_Address: Assets/Content/WorldObjects/Items/Clothing/HeadsetSecurityLeft.prefab
     m_ReadOnly: 0

diff --git a/Assets/Content/Addressables/AssetGroups/ParticlesEffects.asset b/Assets/Content/Addressables/AssetGroups/ParticlesEffects.asset
@@ -25,6 +25,10 @@ MonoBehaviour:
     m_Address: Assets/Content/WorldObjects/World/VFX/Health/BleedingParticle.prefab
     m_ReadOnly: 0
     m_SerializedLabels: []
+  - m_GUID: ca5e6b5f7c6c5054a8f8155ef44e3e43
+    m_Address: Assets/Content/WorldObjects/World/VFX/Construction/ConstructionParticle.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/Scenes.asset b/Assets/Content/Addressables/AssetGroups/Scenes.asset
@@ -17,22 +17,6 @@ MonoBehaviour:
     m_SerializedData: []
   m_GUID: e18ea8489b90bd7488de5c242bac11c6
   m_SerializeEntries:
-  - m_GUID: 61687ab4465bb6e4d8164057bedc63db
-    m_Address: Assets/Content/Scenes/Intro.unity
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-  - m_GUID: c7d05c35cd4853643a09333ecceff608
-    m_Address: Assets/Content/Scenes/Game.unity
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-  - m_GUID: 9fc0d4010bbf28b4594072e72b8655ab
-    m_Address: Assets/Content/Scenes/Boot.unity
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-  - m_GUID: a7a0fb29f301d364a822be64003a90cb
-    m_Address: Assets/Content/Scenes/Empty.unity
-    m_ReadOnly: 0
-    m_SerializedLabels: []
   - m_GUID: d03a300180bde5646b09bfa4c392679f
     m_Address: Assets/Content/Scenes/Launcher.unity
     m_ReadOnly: 0

diff --git a/Assets/Content/Data/Databases/CraftingRecipes.asset b/Assets/Content/Data/Databases/CraftingRecipes.asset
@@ -16,8 +16,16 @@ MonoBehaviour:
   AssetGroup: {fileID: 11400000, guid: ead2cce9e35a7304ab5b8cc67d03347b, type: 2}
   Assets:
     _list:
-    - _key: SlicedBananas
-      _value: {fileID: 11400000, guid: 5dafa9029944cdc448a9e1d6d67e438f, type: 2}
     - _key: WeirdComplexRecipe
       _value: {fileID: 11400000, guid: 5069902a314070f4ca869692cbc791fa, type: 2}
+    - _key: SteelGirderUnboltedRecipe
+      _value: {fileID: 11400000, guid: 41ed3a9a199817b47b7ba22ecb7c1ab4, type: 2}
+    - _key: SteelSheetRecipe
+      _value: {fileID: 11400000, guid: b7f1e5d68b05f6743a606736245ff481, type: 2}
+    - _key: ReinforcedWallRecipe
+      _value: {fileID: 11400000, guid: 115e1db3f2858c14fa6b736f67e552be, type: 2}
+    - _key: SteelWallRecipe
+      _value: {fileID: 11400000, guid: 3d6dc37a96797e442bafcb066f1f9aef, type: 2}
+    - _key: SteelGirderRecipe
+      _value: {fileID: 11400000, guid: 3decef2c351e13b4194d1994c485a170, type: 2}
     _new: 
diff --git a/Assets/Content/Data/Databases/Items.asset b/Assets/Content/Data/Databases/Items.asset
@@ -150,6 +150,14 @@ MonoBehaviour:
       _value: {fileID: 7927487060350510867, guid: c69ed93dc225ea049bbf1a02662c48c0, type: 3}
     - _key: PowerCell
       _value: {fileID: 2402587210622244651, guid: de67200a4c96d444f800399a033ddfef, type: 3}
+    - _key: SteelWall
+      _value: {fileID: 3591147544166670882, guid: 45d13347efae0f54882e0e56dd770bb1, type: 3}
+    - _key: SteelGirder
+      _value: {fileID: 3591147544166670882, guid: 6c2559c2017ada740b245951a23c2e1d, type: 3}
+    - _key: Plenum
+      _value: {fileID: 8028539322119499722, guid: 3b33b5cf16a677a4e85a110679cde32a, type: 3}
+    - _key: SteelGirderUnbolted
+      _value: {fileID: 3591147544166670882, guid: 5dba4171f2124fb48b0e32c0e10841e0, type: 3}
     - _key: GlassReinforcedSheet
       _value: {fileID: 7125681683583715523, guid: a1a7407e08bb2914c97f431063bf83e2, type: 3}
     - _key: GlassSheet
@@ -192,6 +200,12 @@ MonoBehaviour:
       _value: {fileID: 7125681683583715523, guid: cc71128d4bcc0c548ac11481000ac424, type: 3}
     - _key: ElectricalCable
       _value: {fileID: 7125681683583715523, guid: 0e69918696f58e04f846e985ec7405fe, type: 3}
+    - _key: SteelWindow
+      _value: {fileID: 3591147544166670882, guid: b9c224febb4233f4e912745553097652, type: 3}
+    - _key: SteelWallReinforced
+      _value: {fileID: 3591147544166670882, guid: abcc60752234e584d8d98c9dec03e7cc, type: 3}
+    - _key: SteelWindowReinforced
+      _value: {fileID: 3591147544166670882, guid: f2493b5478dd8e946ba98861f533362e, type: 3}
     - _key: HeadsetSecurityLeft
       _value: {fileID: 1529136833643899573, guid: 88d1ba1edb4ce5e4fa74c6a8d53e36e1, type: 3}
     - _key: HeadsetSecurityRight

diff --git a/Assets/Content/Data/Databases/ParticlesEffects.asset b/Assets/Content/Data/Databases/ParticlesEffects.asset
@@ -20,4 +20,6 @@ MonoBehaviour:
       _value: {fileID: 7714517724079113232, guid: 17b0d9163e9cdf14aa557557e7d9d76b, type: 3}
     - _key: BleedingParticle
       _value: {fileID: 6016476664605660376, guid: a6a77c26ee7edd94c804f4ddd851c8ba, type: 3}
+    - _key: ConstructionParticle
+      _value: {fileID: 9126258469831405173, guid: ca5e6b5f7c6c5054a8f8155ef44e3e43, type: 3}
     _new: 
diff --git a/Assets/Content/Data/Recipes/ReinforcedWallRecipe.asset b/Assets/Content/Data/Recipes/ReinforcedWallRecipe.asset
@@ -0,0 +1,37 @@
+%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: c384097cfa3559042be45b4f6328d961, type: 3}
+  m_Name: ReinforcedWallRecipe
+  m_EditorClassIdentifier: 
+  Target: {fileID: 11400000, guid: 9b16536c8b6953b459e5906389bc4cdd, type: 2}
+  Steps:
+  - _name: SteelWallReinforced
+    IsInitialState: 1
+    IsTerminal: 0
+    CustomCraft: 0
+    Result: {fileID: 0}
+  - _name: ReinforcedSteelGirderWithBoltedReinforcedMetalSheets
+    IsInitialState: 0
+    IsTerminal: 1
+    CustomCraft: 0
+    Result: {fileID: 11400000, guid: bbc616cb55d58144eb50ce126cfca103, type: 2}
+  StepLinks:
+  - _elements:
+      _list: []
+      _new: {fileID: 0}
+    _conditions: []
+    _craftingInteractionType: 5
+    _from: SteelWallReinforced
+    _to: ReinforcedSteelGirderWithBoltedReinforcedMetalSheets
+    _modifyResult: 1
+    _executionTime: 4
+    _secondaryResults: []
diff --git a/...ent/Data/Recipes/SlicedBananas.asset.meta → ...a/Recipes/ReinforcedWallRecipe.asset.meta b/...ent/Data/Recipes/SlicedBananas.asset.meta → ...a/Recipes/ReinforcedWallRecipe.asset.meta
diff --git a/Assets/Content/Data/Recipes/SlicedBananas.asset b/Assets/Content/Data/Recipes/SlicedBananas.asset