Push

FlufflParty/Assets/Prefabs/Barrel.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &5480947081188593150
+--- !u!1 &6706216140314994276
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,9 +8,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 5141963950078138180}
-  - component: {fileID: 8139191369505347809}
-  - component: {fileID: 6273725544066083883}
+  - component: {fileID: 6529090747793098881}
+  - component: {fileID: 6529090747793098887}
+  - component: {fileID: 6529090747793098880}
   m_Layer: 0
   m_Name: Barrel
   m_TagString: Untagged
@@ -18,36 +18,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 2147483647
   m_IsActive: 1
---- !u!4 &5141963950078138180
+--- !u!4 &6529090747793098881
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5480947081188593150}
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
-  m_LocalPosition: {x: 85.26, y: 0.0000052452087, z: 96.17}
-  m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
+  m_GameObject: {fileID: 6706216140314994276}
+  m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
+  m_LocalPosition: {x: -47.71566, y: 38.70792, z: -1.8189621}
+  m_LocalScale: {x: 0.3, y: 0.29999998, z: 0.29999998}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &8139191369505347809
+--- !u!33 &6529090747793098887
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5480947081188593150}
+  m_GameObject: {fileID: 6706216140314994276}
   m_Mesh: {fileID: 2534964839176971238, guid: b58b9b5d4a4bda1429d937027c43b3c2, type: 3}
---- !u!23 &6273725544066083883
+--- !u!23 &6529090747793098880
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5480947081188593150}
+  m_GameObject: {fileID: 6706216140314994276}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -61,8 +61,8 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: e7bf391985dce0743af9240059d69c2c, type: 2}
-  - {fileID: 2100000, guid: e04f02a1966cc0c4faf61fc89b39c0cd, type: 2}
+  - {fileID: 2100000, guid: 77bbde00f4a260347930f843de26cb12, type: 2}
+  - {fileID: 2100000, guid: 726cdcd398ce6cb459dc589edfc170ba, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

FlufflParty/Assets/Scenes/Test.unity

@@ -893,8 +893,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
 --- !u!4 &543450652514961522 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-  m_PrefabInstance: {fileID: 4670608318754873142}
+  m_CorrespondingSourceObject: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+  m_PrefabInstance: {fileID: 6706216140347310323}
   m_PrefabAsset: {fileID: 0}
 --- !u!4 &543450652542075647 stripped
 Transform:
@@ -1769,79 +1769,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 616c4d7a7df3216439e209b540a24966, type: 3}
---- !u!1001 &4670608318754873142
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 523664306}
-    m_Modifications:
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_RootOrder
-      value: 28
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 0.29999998
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 0.29999998
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -47.71566
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 38.70792
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -1.8189621
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071067
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5141963950078138180, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5480947081188593150, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_Name
-      value: Barrel
-      objectReference: {fileID: 0}
-    - target: {fileID: 6273725544066083883, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 77bbde00f4a260347930f843de26cb12, type: 2}
-    - target: {fileID: 6273725544066083883, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
-      propertyPath: m_Materials.Array.data[1]
-      value: 
-      objectReference: {fileID: 2100000, guid: 726cdcd398ce6cb459dc589edfc170ba, type: 2}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
 --- !u!1001 &4818382688961611579
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2196,6 +2123,63 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 42ff4322cd19e9f428c4bb2b9d6d3bb7, type: 3}
+--- !u!1001 &6706216140347310323
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 523664306}
+    m_Modifications:
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_RootOrder
+      value: 28
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -47.71566
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 38.70792
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.8189621
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071067
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6529090747793098881, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6706216140314994276, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
+      propertyPath: m_Name
+      value: Barrel
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5d28f0577ebff30408597cdc56e2f3cc, type: 3}
 --- !u!1001 &6828052402524322104
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2475,7 +2459,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -40.733
+      value: -40.81
       objectReference: {fileID: 0}
     - target: {fileID: 8376330369100222945, guid: e5d471764a8bab74991ce859cf7a9108, type: 3}
       propertyPath: m_LocalPosition.y

FlufflParty/Packages/manifest.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.17.6",
+    "com.unity.collab-proxy": "1.17.7",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",

FlufflParty/Packages/packages-lock.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.17.6",
+      "version": "1.17.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -29,12 +29,12 @@
       "source": "builtin",
       "dependencies": {
         "com.unity.ide.visualstudio": "2.0.16",
-        "com.unity.ide.rider": "3.0.15",
+        "com.unity.ide.rider": "3.0.16",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.1.1",
         "com.unity.test-framework": "1.1.31",
-        "com.unity.testtools.codecoverage": "1.0.1"
+        "com.unity.testtools.codecoverage": "1.2.2"
       }
     },
     "com.unity.ide.rider": {
@@ -77,7 +77,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.4.2",
+      "version": "1.6.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -106,7 +106,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.0.1",
+      "version": "1.2.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {

FlufflParty/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.7f1
-m_EditorVersionWithRevision: 2021.3.7f1 (24e8595d6d43)
+m_EditorVersion: 2021.3.16f1
+m_EditorVersionWithRevision: 2021.3.16f1 (4016570cf34f)

FlufflParty/UserSettings/Layouts/default-2021.dwlt

@@ -17,9 +17,9 @@ MonoBehaviour:
     x: 0
     y: 43
     width: 1920
-    height: 1109
+    height: 1117
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Scene
   m_RootView: {fileID: 6}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -44,11 +44,11 @@ MonoBehaviour:
     x: 0
     y: 30
     width: 1920
-    height: 1059
+    height: 1067
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 98
+  controlID: 87
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -64,10 +64,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1477
+    x: 1485
     y: 0
-    width: 443
-    height: 1059
+    width: 435
+    height: 1067
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 14}
@@ -92,8 +92,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 377
-    height: 667
+    width: 351
+    height: 757
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
@@ -117,9 +117,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 667
-    width: 1477
-    height: 392
+    y: 757
+    width: 1485
+    height: 310
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_ActualView: {fileID: 13}
@@ -149,7 +149,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 1920
-    height: 1109
+    height: 1117
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
@@ -194,7 +194,7 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1089
+    y: 1097
     width: 1920
     height: 20
   m_MinSize: {x: 0, y: 0}
@@ -218,12 +218,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1477
-    height: 1059
+    width: 1485
+    height: 1067
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 45
+  controlID: 88
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -243,12 +243,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1477
-    height: 667
+    width: 1485
+    height: 757
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 46
+  controlID: 89
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -264,10 +264,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 377
+    x: 351
     y: 0
-    width: 1100
-    height: 667
+    width: 1134
+    height: 757
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 12}
@@ -296,10 +296,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 377
+    x: 351
     y: 73
-    width: 1098
-    height: 646
+    width: 1132
+    height: 736
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -501,9 +501,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 93.01604, y: 1.8346989, z: 106.972694}
+    m_Target: {x: 93.59731, y: 4.939647, z: 112.05553}
     speed: 2
-    m_Value: {x: 93.01604, y: 1.8346989, z: 106.972694}
+    m_Value: {x: 93.59731, y: 4.939647, z: 112.05553}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -550,13 +550,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.0044538896, y: -0.97194755, z: 0.23508157, w: -0.01804119}
+    m_Target: {x: 0.013650395, y: 0.96815264, z: -0.2449386, w: 0.053116314}
     speed: 2
-    m_Value: {x: -0.0041006664, y: -0.97183233, z: 0.23505384, w: -0.016580839}
+    m_Value: {x: 0.013280833, y: 0.96807534, z: -0.24491936, w: 0.051655706}
   m_Size:
     m_Target: 3.6915483
     speed: 2
-    m_Value: 3.532582
+    m_Value: 3.6915483
   m_Ortho:
     m_Target: 0
     speed: 2
@@ -602,9 +602,9 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 740
-    width: 1476
-    height: 371
+    y: 830
+    width: 1484
+    height: 289
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -622,22 +622,22 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Prefabs
+    - Assets
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Prefabs
+  - Assets
   m_LastFoldersGridSize: -1
-  m_LastProjectPath: F:\Unity\flufflparty\FlufflParty
+  m_LastProjectPath: F:\Projects\Unity\flufflparty\FlufflParty
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 53}
-    m_SelectedIDs: e65c0000
-    m_LastClickedID: 23782
-    m_ExpandedIDs: 00000000a05c0000a25c0000cc5c000000ca9a3b
+    m_SelectedIDs: f6620000
+    m_LastClickedID: 25334
+    m_ExpandedIDs: 00000000f6620000f862000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -665,7 +665,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000a05c0000a25c0000
+    m_ExpandedIDs: 00000000f6620000f8620000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -741,10 +741,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1477
+    x: 1485
     y: 73
-    width: 442
-    height: 1038
+    width: 434
+    height: 1046
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -784,8 +784,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 376
-    height: 646
+    width: 350
+    height: 736
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -795,7 +795,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 32fbffff745a0000
+      m_ExpandedIDs: f8f2ffffc0600000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: