Merge pull request #294 from hackerspace-ntnu/feature/choose-weapon-part

Weapon construction
hackerspace-ntnu · Nov 15, 2023 · d308790 · d308790
2 parents 3a8ff06 + 105c3b9
commit d308790
Show file tree

Hide file tree

Showing 13 changed files with 2,808 additions and 178 deletions.
diff --git a/Assets/Prefabs/Gamestate/MatchManager.prefab b/Assets/Prefabs/Gamestate/MatchManager.prefab
@@ -49,6 +49,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   roundLength: 180
   roundEndDelay: 5
+  biddingEndDelay: 10
   matchEndDelay: 5
   startAmount: 5
   rewardWin: 1
@@ -85,13 +86,14 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   playerPrefab: {fileID: 71015680234268067, guid: 2872a05bf8e94d541a70726bb35085f3, type: 3}
   spawnPoints: []
+  playerSelectItemPrefab: {fileID: 6596575034333967962, guid: 6f9988a3327983940a8001c11c3fe0e7, type: 3}
   globalHUDController: {fileID: 1760732758}
 --- !u!1001 &3272573476935254913
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    serializedVersion: 2
+    serializedVersion: 3
     m_TransformParent: {fileID: 7583196319734858555}
     m_Modifications:
     - target: {fileID: 1381118347005466384, guid: d21a0a379f6981f4496cadc44b0a33b9, type: 3}
@@ -231,7 +233,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
     m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d21a0a379f6981f4496cadc44b0a33b9, type: 3}
 --- !u!224 &1760732757 stripped
 RectTransform: