diff --git a/.github/workflows/editmodetestrunner.yml b/.github/workflows/editmodetestrunner.yml index 424492ef0d..16478e96dd 100644 --- a/.github/workflows/editmodetestrunner.yml +++ b/.github/workflows/editmodetestrunner.yml @@ -13,17 +13,24 @@ jobs: - name: Setup node uses: actions/setup-node@v3 with: - node-version: '16' + node-version: 'lts/*' - run: npm install @actions/core - run: npm install @actions/github - run: npm install jsdom - run: npm install fs + - name: Debug Secret Visibility + run: | + if [ -z "${{ secrets.UNITY_LICENSE }}" ]; then + echo "SECRET IS EMPTY" + else + echo "SECRET IS DEFINED" + fi - name: Run tests - uses: game-ci/unity-test-runner@v2 + uses: game-ci/unity-test-runner@v4 with: testMode: editmode env: - UNITY_LICENSE_FILE: ../Documents/UnityLicense.ulf + UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - name: Produce summary output uses: ./.github/actions/interpret-test-results if: always() diff --git a/Assets/Content/Scenes/Game.unity b/Assets/Content/Scenes/Game.unity index eb5d9d9459..13bc2b85d3 100644 --- a/Assets/Content/Scenes/Game.unity +++ b/Assets/Content/Scenes/Game.unity @@ -38,7 +38,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.05223216, g: 0.058495417, b: 0.04955718, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +116,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -196,13 +195,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 246961638} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &246961642 MonoBehaviour: @@ -279,6 +278,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 274660130} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -286,7 +286,6 @@ Transform: m_Children: - {fileID: 1820032161} m_Father: {fileID: 1506918115} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &274660132 MonoBehaviour: @@ -350,13 +349,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 439774646} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &439774648 MonoBehaviour: @@ -414,13 +413,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 474682041} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -662.0092, y: -384.96207, z: 137.6865} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &474682044 MonoBehaviour: @@ -479,13 +478,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 478499394} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -700.46924, y: -415.26047, z: 42.020546} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &478499396 MonoBehaviour: @@ -528,13 +527,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 478615866} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &478615868 MonoBehaviour: @@ -657,13 +656,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 516802433} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &604587499 GameObject: @@ -689,13 +688,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 604587499} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &604587501 MonoBehaviour: @@ -745,13 +744,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 606666308} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &606666310 MonoBehaviour: @@ -793,13 +792,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616353822} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &616353824 MonoBehaviour: @@ -876,13 +875,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 661652615} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &661652617 MonoBehaviour: @@ -981,13 +980,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 820019860} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &820019862 MonoBehaviour: @@ -1009,6 +1008,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1000564556} m_Modifications: - target: {fileID: 562230263738288595, guid: 06a27ffa07c1c754c9590607a5a80030, type: 3} @@ -1184,6 +1184,9 @@ PrefabInstance: value: Empty Mind objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 06a27ffa07c1c754c9590607a5a80030, type: 3} --- !u!4 &878406319 stripped Transform: @@ -1248,13 +1251,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 913757965} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 990295461} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &913757967 MonoBehaviour: @@ -1396,6 +1399,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 990295459} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.510847, y: -0.9550402, z: -2.0797422} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1404,7 +1408,6 @@ Transform: - {fileID: 1127411103} - {fileID: 913757966} m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &990295462 MonoBehaviour: @@ -1464,6 +1467,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000564555} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1471,7 +1475,6 @@ Transform: m_Children: - {fileID: 878406319} m_Father: {fileID: 1506918115} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1000564557 MonoBehaviour: @@ -1529,6 +1532,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4468402020486027511, guid: cc5383d385556f443b2a7d3202f2b2c1, type: 3} @@ -1633,7 +1637,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4468402021075485018, guid: cc5383d385556f443b2a7d3202f2b2c1, type: 3} propertyPath: m_AnchoredPosition.y - value: -230.00005 + value: -230 objectReference: {fileID: 0} - target: {fileID: 4468402021449001342, guid: cc5383d385556f443b2a7d3202f2b2c1, type: 3} propertyPath: m_AnchoredPosition.x @@ -1748,6 +1752,9 @@ PrefabInstance: value: objectReference: {fileID: 1927660778} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc5383d385556f443b2a7d3202f2b2c1, type: 3} --- !u!114 &1002102148 stripped MonoBehaviour: @@ -1785,13 +1792,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1072838343} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!81 &1072838345 AudioListener: @@ -1815,9 +1822,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1869,13 +1884,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1121348072} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1121348074 MonoBehaviour: @@ -1930,13 +1945,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1127411102} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 990295461} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1127411104 MonoBehaviour: @@ -1997,13 +2012,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161459442} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1161459444 MonoBehaviour: @@ -2052,13 +2067,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1196595938} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -698.7324, y: -317.02176, z: 138.48364} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1196595940 MonoBehaviour: @@ -2107,13 +2122,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1448301644} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1135.0063, y: 387.37747, z: 4.5864706} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1462625201 stripped GameObject: @@ -2179,6 +2194,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1506918114} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 698.9584, y: 414.30542, z: -44.10029} m_LocalScale: {x: 1, y: 1, z: 1} @@ -2204,7 +2220,6 @@ Transform: - {fileID: 478499395} - {fileID: 478615867} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1506918116 MonoBehaviour: @@ -2307,13 +2322,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604094693} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1604094695 MonoBehaviour: @@ -2387,13 +2402,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1679380531} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1135.0063, y: 387.37747, z: 4.5864706} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1820032161 stripped Transform: @@ -2425,13 +2440,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1927660776} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1927660778 MonoBehaviour: @@ -2507,13 +2522,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1980231548} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1506918115} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1980231550 MonoBehaviour: @@ -2566,13 +2581,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005945306} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1135.0063, y: 387.37747, z: 4.5864706} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2103898777 GameObject: @@ -2597,13 +2612,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2103898777} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1135.0063, y: 387.37747, z: 4.5864706} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &1113205650295772864 stripped RectTransform: @@ -2615,6 +2630,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1962741443027797558, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3} @@ -2770,12 +2786,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 14b8b7b37cbe54a44a994f9d927bf213, type: 3} --- !u!1001 &2043399949070312488 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1380770865377990216, guid: 36a9b43d64c241947963f4bd50dfcaae, type: 3} @@ -2867,12 +2887,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 36a9b43d64c241947963f4bd50dfcaae, type: 3} --- !u!1001 &3566512690706384257 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 725847761, guid: 2d191bd0e2c3e2f4b9ec68793b19550a, type: 3} @@ -3256,12 +3280,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d191bd0e2c3e2f4b9ec68793b19550a, type: 3} --- !u!1001 &3810371244444567007 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 533894651356499960, guid: df2268f4f5f6669459174c6d7e2043ce, type: 3} @@ -4112,6 +4140,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8350229863795259186, guid: df2268f4f5f6669459174c6d7e2043ce, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8522562115269630352, guid: df2268f4f5f6669459174c6d7e2043ce, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4253,6 +4285,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df2268f4f5f6669459174c6d7e2043ce, type: 3} --- !u!1 &4063634576653966196 GameObject: @@ -4284,7 +4319,6 @@ RectTransform: m_Children: - {fileID: 4063634577254807362} m_Father: {fileID: 4063634577397676410} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4296,6 +4330,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 427758460} m_Modifications: - target: {fileID: 2927083977695802371, guid: 6aecc2b8318cea944a959bdac27144af, type: 3} @@ -4431,7 +4466,15 @@ PrefabInstance: value: -10 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6aecc2b8318cea944a959bdac27144af, type: 3} +--- !u!224 &4063634576920649757 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2927083977695802371, guid: 6aecc2b8318cea944a959bdac27144af, type: 3} + m_PrefabInstance: {fileID: 4063634576920649756} + m_PrefabAsset: {fileID: 0} --- !u!114 &4063634577063753877 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4504,7 +4547,6 @@ RectTransform: m_Children: - {fileID: 669009801} m_Father: {fileID: 4063634577348537733} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4524,7 +4566,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4063634576653966199} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4614,7 +4655,6 @@ RectTransform: m_Children: - {fileID: 4063634577063753899} m_Father: {fileID: 4063634578398742985} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4779,7 +4819,6 @@ RectTransform: m_Children: - {fileID: 4063634576653966199} m_Father: {fileID: 4063634578398742985} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4810,6 +4849,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 427758460} m_Modifications: - target: {fileID: 4704954278464321881, guid: 438f56fe839e5c645b04b0db240fcc21, type: 3} @@ -4953,7 +4993,15 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 438f56fe839e5c645b04b0db240fcc21, type: 3} +--- !u!224 &4063634577466466583 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4704954278481815051, guid: 438f56fe839e5c645b04b0db240fcc21, type: 3} + m_PrefabInstance: {fileID: 4063634577466466582} + m_PrefabAsset: {fileID: 0} --- !u!114 &4063634577526957108 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5006,7 +5054,6 @@ RectTransform: m_Children: - {fileID: 4063634578398742985} m_Father: {fileID: 773455214} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5036,6 +5083,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 427758460} m_Modifications: - target: {fileID: 4714992645028609035, guid: eed9d966f69b7814fa97870c8044e4a7, type: 3} @@ -5175,7 +5223,15 @@ PrefabInstance: value: SS3D.UI.Settings.GlobalUiVisibilityController, SS3D.UI objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eed9d966f69b7814fa97870c8044e4a7, type: 3} +--- !u!224 &4063634578279369065 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8925357640281819906, guid: eed9d966f69b7814fa97870c8044e4a7, type: 3} + m_PrefabInstance: {fileID: 4063634578279369064} + m_PrefabAsset: {fileID: 0} --- !u!114 &4063634578398742984 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5221,7 +5277,6 @@ RectTransform: - {fileID: 4063634577348537733} - {fileID: 4063634577397676410} m_Father: {fileID: 4063634577526957514} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5290,6 +5345,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4063634577063753899} m_Modifications: - target: {fileID: 7839063151111624130, guid: ef47552bb578a784f8ef9916b369b6fb, type: 3} @@ -5425,12 +5481,25 @@ PrefabInstance: value: 410784623398912 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7839063152655121251, guid: ef47552bb578a784f8ef9916b369b6fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 4063634578279369065} + - targetCorrespondingSourceObject: {fileID: 7839063152655121251, guid: ef47552bb578a784f8ef9916b369b6fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 4063634577466466583} + - targetCorrespondingSourceObject: {fileID: 7839063152655121251, guid: ef47552bb578a784f8ef9916b369b6fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 4063634576920649757} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef47552bb578a784f8ef9916b369b6fb, type: 3} --- !u!1001 &4302234172826802611 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4302234172762346563, guid: 313c7a6f7eaaf4f4cb80cbe0fe77005d, type: 3} @@ -5590,12 +5659,19 @@ PrefabInstance: value: objectReference: {fileID: 4370972904279086841} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4302234173136898546, guid: 313c7a6f7eaaf4f4cb80cbe0fe77005d, type: 3} + insertIndex: -1 + addedObject: {fileID: 944193800} m_SourcePrefab: {fileID: 100100000, guid: 313c7a6f7eaaf4f4cb80cbe0fe77005d, type: 3} --- !u!1001 &4370972904279086840 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 55875275, guid: 8c378d8ec3d1cda4389f92d2d8703b6a, type: 3} @@ -6143,6 +6219,18 @@ PrefabInstance: value: GUID:d2a66e9e1fb4a534da0ec381c31605b4 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3736358311565132652, guid: 8c378d8ec3d1cda4389f92d2d8703b6a, type: 3} + insertIndex: -1 + addedObject: {fileID: 4063634577526957514} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4370972905076281512, guid: 8c378d8ec3d1cda4389f92d2d8703b6a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1462625211} + - targetCorrespondingSourceObject: {fileID: 996747443, guid: 8c378d8ec3d1cda4389f92d2d8703b6a, type: 3} + insertIndex: -1 + addedObject: {fileID: 4370972904279086851} m_SourcePrefab: {fileID: 100100000, guid: 8c378d8ec3d1cda4389f92d2d8703b6a, type: 3} --- !u!114 &4370972904279086841 stripped MonoBehaviour: @@ -6233,6 +6321,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1722473289467115438, guid: b904697874e9a0445ad5e0c9cad35c19, type: 3} @@ -6320,12 +6409,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b904697874e9a0445ad5e0c9cad35c19, type: 3} --- !u!1001 &4601163164975837668 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4601163165956833124, guid: 750a1d0408617fe4984cb6dacdfc1e9f, type: 3} @@ -6421,12 +6514,16 @@ PrefabInstance: value: Canvas Template objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 750a1d0408617fe4984cb6dacdfc1e9f, type: 3} --- !u!1001 &6020083413418950220 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 6020083413386711966, guid: dfcd83503e242c843a6bc43cc5040fc9, type: 3} @@ -6614,12 +6711,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dfcd83503e242c843a6bc43cc5040fc9, type: 3} --- !u!1001 &7939122255491585874 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 274660131} m_Modifications: - target: {fileID: 7939122254879796210, guid: 2dff3e99d61d74c4282d2983e482289c, type: 3} @@ -6679,12 +6780,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2dff3e99d61d74c4282d2983e482289c, type: 3} --- !u!1001 &8271802096707585887 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3868148100880961364, guid: e4756570686f0b04db6595ad87e5381f, type: 3} @@ -6780,6 +6885,9 @@ PrefabInstance: value: objectReference: {fileID: 187882043} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4756570686f0b04db6595ad87e5381f, type: 3} --- !u!114 &8271802096707585888 stripped MonoBehaviour: @@ -6792,3 +6900,25 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6cda669bae7d4d6686e5b8e365835040, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2103898778} + - {fileID: 2043399949070312488} + - {fileID: 1072838344} + - {fileID: 1506918115} + - {fileID: 990295461} + - {fileID: 1679380532} + - {fileID: 4601163164975837668} + - {fileID: 4370972904279086840} + - {fileID: 3566512690706384257} + - {fileID: 3810371244444567007} + - {fileID: 8271802096707585887} + - {fileID: 4302234172826802611} + - {fileID: 2005945307} + - {fileID: 6020083413418950220} + - {fileID: 1962741445064829233} + - {fileID: 4559952173117635203} + - {fileID: 1448301645} + - {fileID: 1002102147} diff --git a/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab b/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab index 3800fdd8b8..b08672b764 100644 --- a/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab +++ b/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 842109859143857316} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.36018407} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 8513168168142475973} m_Father: {fileID: 8000206429567224176} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8465684181923302409 MeshFilter: @@ -109,6 +109,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027726231699643833} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.27300644, y: 0.4049225, z: 0.38256073} m_LocalScale: {x: 1, y: 1, z: 1} @@ -116,7 +117,6 @@ Transform: m_Children: - {fileID: 8948675531444066413} m_Father: {fileID: 7611268691435572321} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3325647021237745552 MeshFilter: @@ -191,6 +191,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1210018499268335303} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -198,7 +199,6 @@ Transform: m_Children: - {fileID: 7953735813086355161} m_Father: {fileID: 6719813189308296762} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1630728673906472420 GameObject: @@ -226,6 +226,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1630728673906472420} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.47098732, z: 0.5485352} m_LocalScale: {x: 1, y: 1, z: 1} @@ -233,7 +234,6 @@ Transform: m_Children: - {fileID: 555621714863886619} m_Father: {fileID: 7611268691435572321} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6304795566047552839 MeshFilter: @@ -326,6 +326,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1884504135123510288} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.54943085, z: -0.22072601} m_LocalScale: {x: 1, y: 1, z: 1} @@ -341,7 +342,6 @@ Transform: - {fileID: 5555643614376619960} - {fileID: 8000206429567224176} m_Father: {fileID: 7953735813086355161} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4341439036329222406 MeshFilter: @@ -418,13 +418,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1960292544252088623} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.32313585, y: 0.4308777, z: -0.42126465} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7062011099588010521 MeshFilter: @@ -501,13 +501,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2027775597086293142} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &95946900281844392 MeshFilter: @@ -584,6 +584,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2091374063048888795} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.27300787, y: 0.4049225, z: 0.38256073} m_LocalScale: {x: 1, y: 1, z: 1} @@ -591,7 +592,6 @@ Transform: m_Children: - {fileID: 129193963181823977} m_Father: {fileID: 7611268691435572321} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9054794873209813535 MeshFilter: @@ -668,6 +668,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2322840128167650537} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.09084988, y: 1.0092945, z: 0.34349525} m_LocalScale: {x: 1, y: 1, z: 1} @@ -675,7 +676,6 @@ Transform: m_Children: - {fileID: 4750282988754042752} m_Father: {fileID: 7611268691435572321} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3306776422875237825 MeshFilter: @@ -751,13 +751,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3906119725786553257} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5189923601338251518} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!108 &7153098361639636189 Light: @@ -846,13 +846,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4619114206299722229} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.052389145, y: -0.27021027, z: 0.4108963} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2444706294197186616} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4701825463511423032 MeshFilter: @@ -930,13 +930,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4735416946264660042} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.3243642, y: 0.47979736, z: 0.36264038} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2367268253799319416 MeshFilter: @@ -1013,13 +1013,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4970296589445009037} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.052390575, y: -0.2842636, z: 0.4108963} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8578760717170580618} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4794602773758636679 MeshFilter: @@ -1096,13 +1096,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5371605354914418545} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 6719813189308296762} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &8722018284479419557 BoxCollider: @@ -1112,9 +1112,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5371605354914418545} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 3.8861024, y: 8.780403, z: 9.329491} m_Center: {x: -0.011937022, y: 4.345188, z: -1.3250542} --- !u!1 &5978730660518739208 @@ -1142,13 +1150,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5978730660518739208} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.54942894, z: 0.22072303} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7611268691435572321} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &688297858495619719 MeshFilter: @@ -1225,6 +1233,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6092570392139261784} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.8715458, z: -0.39381707} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1232,7 +1241,6 @@ Transform: m_Children: - {fileID: 3055783962014044920} m_Father: {fileID: 7611268691435572321} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6594363280051312612 MeshFilter: @@ -1318,6 +1326,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6199841308937614464} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.6994371, y: 99.99021, z: 101.48412} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1327,7 +1336,6 @@ Transform: - {fileID: 6852574109517490658} - {fileID: 1018753449391517355} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1019513474262773944 MonoBehaviour: @@ -1433,7 +1441,7 @@ MonoBehaviour: _sendToOwner: 0 --- !u!95 &1669376080218637799 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1450,7 +1458,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!143 &8159127053265572578 CharacterController: m_ObjectHideFlags: 0 @@ -1459,9 +1468,17 @@ CharacterController: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6199841308937614464} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Height: 1.48 m_Radius: 0.38 m_SlopeLimit: 45 @@ -1586,13 +1603,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6250850031364791032} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.0013241768, y: 1.035265, z: 0.0314759} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7611268691435572321} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5221859642709671071 SkinnedMeshRenderer: @@ -1672,13 +1689,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6264491783416700261} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3055783962014044920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3545750978987933495 MeshFilter: @@ -1755,13 +1772,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6352098336571219175} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.32314348, y: 0.5213089, z: -0.027786255} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1584332682607889718 MeshFilter: @@ -1838,13 +1855,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6543797762567235542} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.32378244, y: 0.3389511, z: -0.42282104} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1415406805107945771 MeshFilter: @@ -1922,13 +1939,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7490066921173412215} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.0019989014, y: 0.0040923357, z: 0.26026374} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7998542976687520734} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1419172769376602198 MeshFilter: @@ -2021,13 +2038,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7510732303406929244} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.5769882, z: -0.5480881} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1420545986781840416 MeshFilter: @@ -2104,13 +2121,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7922189560258592544} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.21872568, y: 0.8715458, z: -0.39381707} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7611268691435572321} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &184731408507308848 MeshFilter: @@ -2187,13 +2204,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8118391457129896878} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.32313585, y: 0.41248322, z: 0.40602112} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7094972080767497936 MeshFilter: @@ -2270,13 +2287,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8719640677756221506} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.21872377, y: 0.8715458, z: -0.39381707} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7611268691435572321} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5282011727641107016 MeshFilter: @@ -2353,6 +2370,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8993495415527952875} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 2.3283064e-10} m_LocalScale: {x: 1, y: 1, z: 1} @@ -2368,7 +2386,6 @@ Transform: - {fileID: 1757362957012235043} - {fileID: 7611268691435572321} m_Father: {fileID: 4301167961274605312} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &800241249895406712 MeshFilter: @@ -2443,13 +2460,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8997088538082488408} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6719813189308296762} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9132705238130881436 GameObject: @@ -2476,13 +2493,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9132705238130881436} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.32314253, y: 0.5213089, z: -0.027786255} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7953735813086355161} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6065007721638739353 MeshFilter: diff --git a/Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarPanel.prefab b/Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarPanel.prefab index 3717402e09..9e50e5acbe 100644 --- a/Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarPanel.prefab +++ b/Assets/Content/WorldObjects/Furniture/Machines/Engineering/SolarPanel.prefab @@ -1,69 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &24529576505488954 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5368364659833148326} - m_Layer: 0 - m_Name: Arm1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5368364659833148326 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 24529576505488954} - m_LocalRotation: {x: 0.7070975, y: -0.0035744, z: -0.003574408, w: 0.7070981} - m_LocalPosition: {x: -0.0000004766922, y: -0.000000010916779, z: -0.10818495} - m_LocalScale: {x: 0.9999998, y: 1.0000002, z: 0.99999994} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2871253202867177793} - m_Father: {fileID: 1913738544526821531} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &541240759913317633 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7821888204805368556} - m_Layer: 0 - m_Name: Arm3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7821888204805368556 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 541240759913317633} - m_LocalRotation: {x: 0.72863936, y: -0.000000033950975, z: 0.0000006372906, w: 0.68489754} - m_LocalPosition: {x: -0.000000034815837, y: 0.40060344, z: 0.00000032600656} - m_LocalScale: {x: 1, y: 1.0000007, z: 1.0000002} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1400036219440598499} - m_Father: {fileID: 2871253202867177793} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &941367499997148975 GameObject: m_ObjectHideFlags: 0 @@ -75,7 +11,7 @@ GameObject: - component: {fileID: 2110600898598905970} - component: {fileID: 9182045811198193135} m_Layer: 0 - m_Name: SolarPanelArm1 + m_Name: SolarPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -93,8 +29,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5630858412342417153} - m_RootOrder: 1 + m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &9182045811198193135 SkinnedMeshRenderer: @@ -138,114 +74,14 @@ SkinnedMeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7327266869174552340, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_Name - value: SolarPanel - objectReference: {fileID: 0} - - target: {fileID: 3946073140703599877, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5297838644154429546, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5369894553364170505, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7288992270420282231, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8006606959063733921, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9123120859591238709, guid: 799f94b87543fdb498490c83108683cb, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 799f94b87543fdb498490c83108683cb, type: 3} ---- !u!1 &6286745912349171764 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 799f94b87543fdb498490c83108683cb, type: 3} - m_PrefabInstance: {fileID: 6628854211070860645} - m_PrefabAsset: {fileID: 0} ---- !u!114 &-7791299743058774860 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6286745912349171764} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e00534faac6488c47893490f2bf4c5a2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &-2191532358309333882 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6286745912349171764} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 38640bf88ae0c29409092a258bd36878, type: 3} - m_Name: - m_EditorClassIdentifier: - key: {fileID: 11400000, guid: 9b4e2ff6eed3b7a4ebf7e79e03bbe25a, type: 2} + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 0} + m_Bones: [] + m_BlendShapeWeights: [] + m_RootBone: {fileID: 0} + m_AABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_DirtyAABB: 0 diff --git a/Assets/DefaultPrefabObjects.asset b/Assets/DefaultPrefabObjects.asset index 9e62d4fee5..32de24d78f 100644 --- a/Assets/DefaultPrefabObjects.asset +++ b/Assets/DefaultPrefabObjects.asset @@ -29,20 +29,15 @@ MonoBehaviour: - {fileID: 6453146791042422614, guid: bdeac5e9a27546348a584caa74f00ec7, type: 3} - {fileID: 2090837846029440516, guid: ddaa28fac1956b2428aff1dac1d89707, type: 3} - {fileID: 6115335805774105745, guid: bf177f8bab26bc84b87fd9a971004418, type: 3} - - {fileID: 6699414010407460003, guid: f1aeab0a35c29314a8a3f823de9815c1, type: 3} - - {fileID: 4692070367735979832, guid: 8725b7f8f45d28a4ba6063318904cc8a, type: 3} - - {fileID: 6270372984438359393, guid: f549f4153ef612c4586c46ea280e0e94, type: 3} - - {fileID: 3346295071430447723, guid: 1a2f912be4bc1b948a2b22ffde517cdc, type: 3} - - {fileID: 2957918649098045964, guid: 88d1ba1edb4ce5e4fa74c6a8d53e36e1, type: 3} - - {fileID: 5462163768199098969, guid: bc08055e4ec2e204f8f46a379b2b6603, type: 3} + - {fileID: 4692070367735979832, guid: 65679cf5a30d6dd458666804af7c3ca3, type: 3} + - {fileID: 3346295071430447723, guid: db15899bc1eb2794fb2b24129852a209, type: 3} + - {fileID: 1193101747660343740, guid: a38ee818c953a404787757d8d20d2851, type: 3} - {fileID: 6405064644360513769, guid: be3fcf1a74268ad49bfedb1edd9f5318, type: 3} - {fileID: 1248430174884186406, guid: 7436f4976849b994aaee40df1bca7d89, type: 3} - {fileID: 2527334834019670621, guid: 236b51ddc6f9aa94ca92579082370c06, type: 3} - {fileID: 8962699864590013468, guid: 93ad90421a3b2f64e8fdb9e95a42ba90, type: 3} - - {fileID: 8681604604373809337, guid: 5fa15d6fdef93dc4e80d798cefe8be0b, type: 3} - - {fileID: 8663352389375050187, guid: 317ec7dcff3b11d4eae3a47929200b93, type: 3} - - {fileID: 8657890218937463745, guid: 4b790b4ffedbe564dab49f896d71eaa6, type: 3} - - {fileID: 7421556062366613563, guid: d7d68992cbd3cda45bb11a35a1490dc3, type: 3} + - {fileID: 8663352389375050187, guid: 81faf4debf00a0a478b924176f48d011, type: 3} + - {fileID: 7421556062366613563, guid: 535ed7c02b5cbdc43ae2b234a963c5cc, type: 3} - {fileID: 3546473533537016869, guid: 9b9f6bd470226a74b903e74dbe9e423a, type: 3} - {fileID: 7384563213340008115, guid: 40d904629802fc942860ce878e78efef, type: 3} - {fileID: -1921154974467191097, guid: 1ef3c21a685ec2d4e9f0876719839d5f, type: 3} diff --git a/Assets/FishNet/Runtime/Generated/Component/Prediction/PredictedObject.Rigidbodies.cs b/Assets/FishNet/Runtime/Generated/Component/Prediction/PredictedObject.Rigidbodies.cs index b83c3d1d35..568761e4fe 100644 --- a/Assets/FishNet/Runtime/Generated/Component/Prediction/PredictedObject.Rigidbodies.cs +++ b/Assets/FishNet/Runtime/Generated/Component/Prediction/PredictedObject.Rigidbodies.cs @@ -206,7 +206,7 @@ private void Rigidbodies_OnOwnershipClient(NetworkConnection prevOwner) #if UNITY_2022_1_OR_NEWER _graphicalAnimators[i].keepAnimatorStateOnDisable = true; #else - _graphicalAnimators[i].keepAnimatorControllerStateOnDisable = true; + _graphicalAnimators[i].keepAnimatorStateOnDisable = true; #endif /* True if at least one animator is on the graphical root. diff --git a/Assets/Scripts/External/Hierarchy 2/Editor/HierarchyEditor.cs b/Assets/Scripts/External/Hierarchy 2/Editor/HierarchyEditor.cs index ea5c5f8f42..2bf3e264d0 100644 --- a/Assets/Scripts/External/Hierarchy 2/Editor/HierarchyEditor.cs +++ b/Assets/Scripts/External/Hierarchy 2/Editor/HierarchyEditor.cs @@ -5,14 +5,11 @@ using System.Reflection; using UnityEditor; using UnityEditor.SceneManagement; -using UnityEditor.Experimental.SceneManagement; using UnityEditorInternal; using UnityEditor.Callbacks; -using UnityEditor.UIElements; using UnityEditor.IMGUI.Controls; using UnityEngine; using UnityEngine.SceneManagement; -using UnityEngine.UIElements; namespace Hierarchy2 { diff --git a/Assets/Scripts/SS3D/Systems/Inputs/Controls.cs b/Assets/Scripts/SS3D/Systems/Inputs/Controls.cs index 48cd2ea593..27054c074c 100644 --- a/Assets/Scripts/SS3D/Systems/Inputs/Controls.cs +++ b/Assets/Scripts/SS3D/Systems/Inputs/Controls.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator -// version 1.7.0 +// version 1.14.2 // from Assets/Content/Systems/Input/Controls.inputactions // // Changes to this file may cause incorrect behavior and will be lost if @@ -17,12 +17,77 @@ namespace SS3D.Systems.Inputs { + /// + /// Provides programmatic access to , , and instances defined in asset "Assets/Content/Systems/Input/Controls.inputactions". + /// + /// + /// This class is source generated and any manual edits will be discarded if the associated asset is reimported or modified. + /// + /// + /// + /// using namespace UnityEngine; + /// using UnityEngine.InputSystem; + /// + /// // Example of using an InputActionMap named "Player" from a UnityEngine.MonoBehaviour implementing callback interface. + /// public class Example : MonoBehaviour, MyActions.IPlayerActions + /// { + /// private MyActions_Actions m_Actions; // Source code representation of asset. + /// private MyActions_Actions.PlayerActions m_Player; // Source code representation of action map. + /// + /// void Awake() + /// { + /// m_Actions = new MyActions_Actions(); // Create asset object. + /// m_Player = m_Actions.Player; // Extract action map object. + /// m_Player.AddCallbacks(this); // Register callback interface IPlayerActions. + /// } + /// + /// void OnDestroy() + /// { + /// m_Actions.Dispose(); // Destroy asset object. + /// } + /// + /// void OnEnable() + /// { + /// m_Player.Enable(); // Enable all actions within map. + /// } + /// + /// void OnDisable() + /// { + /// m_Player.Disable(); // Disable all actions within map. + /// } + /// + /// #region Interface implementation of MyActions.IPlayerActions + /// + /// // Invoked when "Move" action is either started, performed or canceled. + /// public void OnMove(InputAction.CallbackContext context) + /// { + /// Debug.Log($"OnMove: {context.ReadValue<Vector2>()}"); + /// } + /// + /// // Invoked when "Attack" action is either started, performed or canceled. + /// public void OnAttack(InputAction.CallbackContext context) + /// { + /// Debug.Log($"OnAttack: {context.ReadValue<float>()}"); + /// } + /// + /// #endregion + /// } + /// + /// public partial class @Controls: IInputActionCollection2, IDisposable { + /// + /// Provides access to the underlying asset instance. + /// public InputActionAsset asset { get; } + + /// + /// Constructs a new instance. + /// public @Controls() { asset = InputActionAsset.FromJson(@"{ + ""version"": 1, ""name"": ""Controls"", ""maps"": [ { @@ -1108,57 +1173,82 @@ public @Controls() m_Interactions_ViewInteractions = m_Interactions.FindAction("View Interactions", throwIfNotFound: true); } + ~@Controls() + { + UnityEngine.Debug.Assert(!m_Camera.enabled, "This will cause a leak and performance issues, Controls.Camera.Disable() has not been called."); + UnityEngine.Debug.Assert(!m_Movement.enabled, "This will cause a leak and performance issues, Controls.Movement.Disable() has not been called."); + UnityEngine.Debug.Assert(!m_Console.enabled, "This will cause a leak and performance issues, Controls.Console.Disable() has not been called."); + UnityEngine.Debug.Assert(!m_Hotkeys.enabled, "This will cause a leak and performance issues, Controls.Hotkeys.Disable() has not been called."); + UnityEngine.Debug.Assert(!m_Other.enabled, "This will cause a leak and performance issues, Controls.Other.Disable() has not been called."); + UnityEngine.Debug.Assert(!m_TileCreator.enabled, "This will cause a leak and performance issues, Controls.TileCreator.Disable() has not been called."); + UnityEngine.Debug.Assert(!m_Interactions.enabled, "This will cause a leak and performance issues, Controls.Interactions.Disable() has not been called."); + } + + /// + /// Destroys this asset and all associated instances. + /// public void Dispose() { UnityEngine.Object.Destroy(asset); } + /// public InputBinding? bindingMask { get => asset.bindingMask; set => asset.bindingMask = value; } + /// public ReadOnlyArray? devices { get => asset.devices; set => asset.devices = value; } + /// public ReadOnlyArray controlSchemes => asset.controlSchemes; + /// public bool Contains(InputAction action) { return asset.Contains(action); } + /// public IEnumerator GetEnumerator() { return asset.GetEnumerator(); } + /// IEnumerator IEnumerable.GetEnumerator() { return GetEnumerator(); } + /// public void Enable() { asset.Enable(); } + /// public void Disable() { asset.Disable(); } + /// public IEnumerable bindings => asset.bindings; + /// public InputAction FindAction(string actionNameOrId, bool throwIfNotFound = false) { return asset.FindAction(actionNameOrId, throwIfNotFound); } + /// public int FindBinding(InputBinding bindingMask, out InputAction action) { return asset.FindBinding(bindingMask, out action); @@ -1173,21 +1263,63 @@ public int FindBinding(InputBinding bindingMask, out InputAction action) private readonly InputAction m_Camera_MouseRotation; private readonly InputAction m_Camera_SnapRight; private readonly InputAction m_Camera_SnapLeft; + /// + /// Provides access to input actions defined in input action map "Camera". + /// public struct CameraActions { private @Controls m_Wrapper; + + /// + /// Construct a new instance of the input action map wrapper class. + /// public CameraActions(@Controls wrapper) { m_Wrapper = wrapper; } + /// + /// Provides access to the underlying input action "Camera/Zoom". + /// public InputAction @Zoom => m_Wrapper.m_Camera_Zoom; + /// + /// Provides access to the underlying input action "Camera/VerticalRotation". + /// public InputAction @VerticalRotation => m_Wrapper.m_Camera_VerticalRotation; + /// + /// Provides access to the underlying input action "Camera/HorizontalRotation". + /// public InputAction @HorizontalRotation => m_Wrapper.m_Camera_HorizontalRotation; + /// + /// Provides access to the underlying input action "Camera/MouseRotation". + /// public InputAction @MouseRotation => m_Wrapper.m_Camera_MouseRotation; + /// + /// Provides access to the underlying input action "Camera/SnapRight". + /// public InputAction @SnapRight => m_Wrapper.m_Camera_SnapRight; + /// + /// Provides access to the underlying input action "Camera/SnapLeft". + /// public InputAction @SnapLeft => m_Wrapper.m_Camera_SnapLeft; + /// + /// Provides access to the underlying input action map instance. + /// public InputActionMap Get() { return m_Wrapper.m_Camera; } + /// public void Enable() { Get().Enable(); } + /// public void Disable() { Get().Disable(); } + /// public bool enabled => Get().enabled; + /// + /// Implicitly converts an to an instance. + /// public static implicit operator InputActionMap(CameraActions set) { return set.Get(); } + /// + /// Adds , and callbacks provided via on all input actions contained in this map. + /// + /// Callback instance. + /// + /// If is null or have already been added this method does nothing. + /// + /// public void AddCallbacks(ICameraActions instance) { if (instance == null || m_Wrapper.m_CameraActionsCallbackInterfaces.Contains(instance)) return; @@ -1212,6 +1344,13 @@ public void AddCallbacks(ICameraActions instance) @SnapLeft.canceled += instance.OnSnapLeft; } + /// + /// Removes , and callbacks provided via on all input actions contained in this map. + /// + /// + /// Calling this method when have not previously been registered has no side-effects. + /// + /// private void UnregisterCallbacks(ICameraActions instance) { @Zoom.started -= instance.OnZoom; @@ -1234,12 +1373,25 @@ private void UnregisterCallbacks(ICameraActions instance) @SnapLeft.canceled -= instance.OnSnapLeft; } + /// + /// Unregisters and unregisters all input action callbacks via . + /// + /// public void RemoveCallbacks(ICameraActions instance) { if (m_Wrapper.m_CameraActionsCallbackInterfaces.Remove(instance)) UnregisterCallbacks(instance); } + /// + /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . + /// + /// + /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. + /// + /// + /// + /// public void SetCallbacks(ICameraActions instance) { foreach (var item in m_Wrapper.m_CameraActionsCallbackInterfaces) @@ -1248,6 +1400,9 @@ public void SetCallbacks(ICameraActions instance) AddCallbacks(instance); } } + /// + /// Provides a new instance referencing this action map. + /// public CameraActions @Camera => new CameraActions(this); // Movement @@ -1255,17 +1410,47 @@ public void SetCallbacks(ICameraActions instance) private List m_MovementActionsCallbackInterfaces = new List(); private readonly InputAction m_Movement_Movement; private readonly InputAction m_Movement_ToggleRun; + /// + /// Provides access to input actions defined in input action map "Movement". + /// public struct MovementActions { private @Controls m_Wrapper; + + /// + /// Construct a new instance of the input action map wrapper class. + /// public MovementActions(@Controls wrapper) { m_Wrapper = wrapper; } + /// + /// Provides access to the underlying input action "Movement/Movement". + /// public InputAction @Movement => m_Wrapper.m_Movement_Movement; + /// + /// Provides access to the underlying input action "Movement/ToggleRun". + /// public InputAction @ToggleRun => m_Wrapper.m_Movement_ToggleRun; + /// + /// Provides access to the underlying input action map instance. + /// public InputActionMap Get() { return m_Wrapper.m_Movement; } + /// public void Enable() { Get().Enable(); } + /// public void Disable() { Get().Disable(); } + /// public bool enabled => Get().enabled; + /// + /// Implicitly converts an to an instance. + /// public static implicit operator InputActionMap(MovementActions set) { return set.Get(); } + /// + /// Adds , and callbacks provided via on all input actions contained in this map. + /// + /// Callback instance. + /// + /// If is null or have already been added this method does nothing. + /// + /// public void AddCallbacks(IMovementActions instance) { if (instance == null || m_Wrapper.m_MovementActionsCallbackInterfaces.Contains(instance)) return; @@ -1278,6 +1463,13 @@ public void AddCallbacks(IMovementActions instance) @ToggleRun.canceled += instance.OnToggleRun; } + /// + /// Removes , and callbacks provided via on all input actions contained in this map. + /// + /// + /// Calling this method when have not previously been registered has no side-effects. + /// + /// private void UnregisterCallbacks(IMovementActions instance) { @Movement.started -= instance.OnMovement; @@ -1288,12 +1480,25 @@ private void UnregisterCallbacks(IMovementActions instance) @ToggleRun.canceled -= instance.OnToggleRun; } + /// + /// Unregisters and unregisters all input action callbacks via . + /// + /// public void RemoveCallbacks(IMovementActions instance) { if (m_Wrapper.m_MovementActionsCallbackInterfaces.Remove(instance)) UnregisterCallbacks(instance); } + /// + /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . + /// + /// + /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. + /// + /// + /// + /// public void SetCallbacks(IMovementActions instance) { foreach (var item in m_Wrapper.m_MovementActionsCallbackInterfaces) @@ -1302,6 +1507,9 @@ public void SetCallbacks(IMovementActions instance) AddCallbacks(instance); } } + /// + /// Provides a new instance referencing this action map. + /// public MovementActions @Movement => new MovementActions(this); // Console @@ -1311,19 +1519,55 @@ public void SetCallbacks(IMovementActions instance) private readonly InputAction m_Console_Close; private readonly InputAction m_Console_Submit; private readonly InputAction m_Console_SwitchCommand; + /// + /// Provides access to input actions defined in input action map "Console". + /// public struct ConsoleActions { private @Controls m_Wrapper; + + /// + /// Construct a new instance of the input action map wrapper class. + /// public ConsoleActions(@Controls wrapper) { m_Wrapper = wrapper; } + /// + /// Provides access to the underlying input action "Console/Open". + /// public InputAction @Open => m_Wrapper.m_Console_Open; + /// + /// Provides access to the underlying input action "Console/Close". + /// public InputAction @Close => m_Wrapper.m_Console_Close; + /// + /// Provides access to the underlying input action "Console/Submit". + /// public InputAction @Submit => m_Wrapper.m_Console_Submit; + /// + /// Provides access to the underlying input action "Console/SwitchCommand". + /// public InputAction @SwitchCommand => m_Wrapper.m_Console_SwitchCommand; + /// + /// Provides access to the underlying input action map instance. + /// public InputActionMap Get() { return m_Wrapper.m_Console; } + /// public void Enable() { Get().Enable(); } + /// public void Disable() { Get().Disable(); } + /// public bool enabled => Get().enabled; + /// + /// Implicitly converts an to an instance. + /// public static implicit operator InputActionMap(ConsoleActions set) { return set.Get(); } + /// + /// Adds , and callbacks provided via on all input actions contained in this map. + /// + /// Callback instance. + /// + /// If is null or have already been added this method does nothing. + /// + /// public void AddCallbacks(IConsoleActions instance) { if (instance == null || m_Wrapper.m_ConsoleActionsCallbackInterfaces.Contains(instance)) return; @@ -1342,6 +1586,13 @@ public void AddCallbacks(IConsoleActions instance) @SwitchCommand.canceled += instance.OnSwitchCommand; } + /// + /// Removes , and callbacks provided via on all input actions contained in this map. + /// + /// + /// Calling this method when have not previously been registered has no side-effects. + /// + /// private void UnregisterCallbacks(IConsoleActions instance) { @Open.started -= instance.OnOpen; @@ -1358,12 +1609,25 @@ private void UnregisterCallbacks(IConsoleActions instance) @SwitchCommand.canceled -= instance.OnSwitchCommand; } + /// + /// Unregisters and unregisters all input action callbacks via . + /// + /// public void RemoveCallbacks(IConsoleActions instance) { if (m_Wrapper.m_ConsoleActionsCallbackInterfaces.Remove(instance)) UnregisterCallbacks(instance); } + /// + /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . + /// + /// + /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. + /// + /// + /// + /// public void SetCallbacks(IConsoleActions instance) { foreach (var item in m_Wrapper.m_ConsoleActionsCallbackInterfaces) @@ -1372,6 +1636,9 @@ public void SetCallbacks(IConsoleActions instance) AddCallbacks(instance); } } + /// + /// Provides a new instance referencing this action map. + /// public ConsoleActions @Console => new ConsoleActions(this); // Hotkeys @@ -1381,19 +1648,55 @@ public void SetCallbacks(IConsoleActions instance) private readonly InputAction m_Hotkeys_Use; private readonly InputAction m_Hotkeys_Drop; private readonly InputAction m_Hotkeys_ToggleInternalClothing; + /// + /// Provides access to input actions defined in input action map "Hotkeys". + /// public struct HotkeysActions { private @Controls m_Wrapper; + + /// + /// Construct a new instance of the input action map wrapper class. + /// public HotkeysActions(@Controls wrapper) { m_Wrapper = wrapper; } + /// + /// Provides access to the underlying input action "Hotkeys/SwapHands". + /// public InputAction @SwapHands => m_Wrapper.m_Hotkeys_SwapHands; + /// + /// Provides access to the underlying input action "Hotkeys/Use". + /// public InputAction @Use => m_Wrapper.m_Hotkeys_Use; + /// + /// Provides access to the underlying input action "Hotkeys/Drop". + /// public InputAction @Drop => m_Wrapper.m_Hotkeys_Drop; + /// + /// Provides access to the underlying input action "Hotkeys/ToggleInternalClothing". + /// public InputAction @ToggleInternalClothing => m_Wrapper.m_Hotkeys_ToggleInternalClothing; + /// + /// Provides access to the underlying input action map instance. + /// public InputActionMap Get() { return m_Wrapper.m_Hotkeys; } + /// public void Enable() { Get().Enable(); } + /// public void Disable() { Get().Disable(); } + /// public bool enabled => Get().enabled; + /// + /// Implicitly converts an to an instance. + /// public static implicit operator InputActionMap(HotkeysActions set) { return set.Get(); } + /// + /// Adds , and callbacks provided via on all input actions contained in this map. + /// + /// Callback instance. + /// + /// If is null or have already been added this method does nothing. + /// + /// public void AddCallbacks(IHotkeysActions instance) { if (instance == null || m_Wrapper.m_HotkeysActionsCallbackInterfaces.Contains(instance)) return; @@ -1412,6 +1715,13 @@ public void AddCallbacks(IHotkeysActions instance) @ToggleInternalClothing.canceled += instance.OnToggleInternalClothing; } + /// + /// Removes , and callbacks provided via on all input actions contained in this map. + /// + /// + /// Calling this method when have not previously been registered has no side-effects. + /// + /// private void UnregisterCallbacks(IHotkeysActions instance) { @SwapHands.started -= instance.OnSwapHands; @@ -1428,12 +1738,25 @@ private void UnregisterCallbacks(IHotkeysActions instance) @ToggleInternalClothing.canceled -= instance.OnToggleInternalClothing; } + /// + /// Unregisters and unregisters all input action callbacks via . + /// + /// public void RemoveCallbacks(IHotkeysActions instance) { if (m_Wrapper.m_HotkeysActionsCallbackInterfaces.Remove(instance)) UnregisterCallbacks(instance); } + /// + /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . + /// + /// + /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. + /// + /// + /// + /// public void SetCallbacks(IHotkeysActions instance) { foreach (var item in m_Wrapper.m_HotkeysActionsCallbackInterfaces) @@ -1442,6 +1765,9 @@ public void SetCallbacks(IHotkeysActions instance) AddCallbacks(instance); } } + /// + /// Provides a new instance referencing this action map. + /// public HotkeysActions @Hotkeys => new HotkeysActions(this); // Other @@ -1460,28 +1786,91 @@ public void SetCallbacks(IHotkeysActions instance) private readonly InputAction m_Other_ShowOwner; private readonly InputAction m_Other_ToggleSelectionDebug; private readonly InputAction m_Other_SendChatMessage; + /// + /// Provides access to input actions defined in input action map "Other". + /// public struct OtherActions { private @Controls m_Wrapper; + + /// + /// Construct a new instance of the input action map wrapper class. + /// public OtherActions(@Controls wrapper) { m_Wrapper = wrapper; } + /// + /// Provides access to the underlying input action "Other/Fade". + /// public InputAction @Fade => m_Wrapper.m_Other_Fade; + /// + /// Provides access to the underlying input action "Other/SwapMinds". + /// public InputAction @SwapMinds => m_Wrapper.m_Other_SwapMinds; + /// + /// Provides access to the underlying input action "Other/PrimaryClick". + /// public InputAction @PrimaryClick => m_Wrapper.m_Other_PrimaryClick; + /// + /// Provides access to the underlying input action "Other/SecondaryClick". + /// public InputAction @SecondaryClick => m_Wrapper.m_Other_SecondaryClick; + /// + /// Provides access to the underlying input action "Other/ToggleMenu". + /// public InputAction @ToggleMenu => m_Wrapper.m_Other_ToggleMenu; + /// + /// Provides access to the underlying input action "Other/SpawnCans". + /// public InputAction @SpawnCans => m_Wrapper.m_Other_SpawnCans; + /// + /// Provides access to the underlying input action "Other/ToggleRuntimeEditor". + /// public InputAction @ToggleRuntimeEditor => m_Wrapper.m_Other_ToggleRuntimeEditor; + /// + /// Provides access to the underlying input action "Other/Ragdoll". + /// public InputAction @Ragdoll => m_Wrapper.m_Other_Ragdoll; + /// + /// Provides access to the underlying input action "Other/Attack". + /// public InputAction @Attack => m_Wrapper.m_Other_Attack; + /// + /// Provides access to the underlying input action "Other/SeeContainerContents". + /// public InputAction @SeeContainerContents => m_Wrapper.m_Other_SeeContainerContents; + /// + /// Provides access to the underlying input action "Other/ShowOwner". + /// public InputAction @ShowOwner => m_Wrapper.m_Other_ShowOwner; + /// + /// Provides access to the underlying input action "Other/ToggleSelectionDebug". + /// public InputAction @ToggleSelectionDebug => m_Wrapper.m_Other_ToggleSelectionDebug; + /// + /// Provides access to the underlying input action "Other/SendChatMessage". + /// public InputAction @SendChatMessage => m_Wrapper.m_Other_SendChatMessage; + /// + /// Provides access to the underlying input action map instance. + /// public InputActionMap Get() { return m_Wrapper.m_Other; } + /// public void Enable() { Get().Enable(); } + /// public void Disable() { Get().Disable(); } + /// public bool enabled => Get().enabled; + /// + /// Implicitly converts an to an instance. + /// public static implicit operator InputActionMap(OtherActions set) { return set.Get(); } + /// + /// Adds , and callbacks provided via on all input actions contained in this map. + /// + /// Callback instance. + /// + /// If is null or have already been added this method does nothing. + /// + /// public void AddCallbacks(IOtherActions instance) { if (instance == null || m_Wrapper.m_OtherActionsCallbackInterfaces.Contains(instance)) return; @@ -1527,6 +1916,13 @@ public void AddCallbacks(IOtherActions instance) @SendChatMessage.canceled += instance.OnSendChatMessage; } + /// + /// Removes , and callbacks provided via on all input actions contained in this map. + /// + /// + /// Calling this method when have not previously been registered has no side-effects. + /// + /// private void UnregisterCallbacks(IOtherActions instance) { @Fade.started -= instance.OnFade; @@ -1570,12 +1966,25 @@ private void UnregisterCallbacks(IOtherActions instance) @SendChatMessage.canceled -= instance.OnSendChatMessage; } + /// + /// Unregisters and unregisters all input action callbacks via . + /// + /// public void RemoveCallbacks(IOtherActions instance) { if (m_Wrapper.m_OtherActionsCallbackInterfaces.Remove(instance)) UnregisterCallbacks(instance); } + /// + /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . + /// + /// + /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. + /// + /// + /// + /// public void SetCallbacks(IOtherActions instance) { foreach (var item in m_Wrapper.m_OtherActionsCallbackInterfaces) @@ -1584,6 +1993,9 @@ public void SetCallbacks(IOtherActions instance) AddCallbacks(instance); } } + /// + /// Provides a new instance referencing this action map. + /// public OtherActions @Other => new OtherActions(this); // Tile Creator @@ -1595,21 +2007,63 @@ public void SetCallbacks(IOtherActions instance) private readonly InputAction m_TileCreator_Rotate; private readonly InputAction m_TileCreator_Delete; private readonly InputAction m_TileCreator_SquareDrag; + /// + /// Provides access to input actions defined in input action map "Tile Creator". + /// public struct TileCreatorActions { private @Controls m_Wrapper; + + /// + /// Construct a new instance of the input action map wrapper class. + /// public TileCreatorActions(@Controls wrapper) { m_Wrapper = wrapper; } + /// + /// Provides access to the underlying input action "TileCreator/ToggleMenu". + /// public InputAction @ToggleMenu => m_Wrapper.m_TileCreator_ToggleMenu; + /// + /// Provides access to the underlying input action "TileCreator/Place". + /// public InputAction @Place => m_Wrapper.m_TileCreator_Place; + /// + /// Provides access to the underlying input action "TileCreator/Replace". + /// public InputAction @Replace => m_Wrapper.m_TileCreator_Replace; + /// + /// Provides access to the underlying input action "TileCreator/Rotate". + /// public InputAction @Rotate => m_Wrapper.m_TileCreator_Rotate; + /// + /// Provides access to the underlying input action "TileCreator/Delete". + /// public InputAction @Delete => m_Wrapper.m_TileCreator_Delete; + /// + /// Provides access to the underlying input action "TileCreator/SquareDrag". + /// public InputAction @SquareDrag => m_Wrapper.m_TileCreator_SquareDrag; + /// + /// Provides access to the underlying input action map instance. + /// public InputActionMap Get() { return m_Wrapper.m_TileCreator; } + /// public void Enable() { Get().Enable(); } + /// public void Disable() { Get().Disable(); } + /// public bool enabled => Get().enabled; + /// + /// Implicitly converts an to an instance. + /// public static implicit operator InputActionMap(TileCreatorActions set) { return set.Get(); } + /// + /// Adds , and callbacks provided via on all input actions contained in this map. + /// + /// Callback instance. + /// + /// If is null or have already been added this method does nothing. + /// + /// public void AddCallbacks(ITileCreatorActions instance) { if (instance == null || m_Wrapper.m_TileCreatorActionsCallbackInterfaces.Contains(instance)) return; @@ -1634,6 +2088,13 @@ public void AddCallbacks(ITileCreatorActions instance) @SquareDrag.canceled += instance.OnSquareDrag; } + /// + /// Removes , and callbacks provided via on all input actions contained in this map. + /// + /// + /// Calling this method when have not previously been registered has no side-effects. + /// + /// private void UnregisterCallbacks(ITileCreatorActions instance) { @ToggleMenu.started -= instance.OnToggleMenu; @@ -1656,12 +2117,25 @@ private void UnregisterCallbacks(ITileCreatorActions instance) @SquareDrag.canceled -= instance.OnSquareDrag; } + /// + /// Unregisters and unregisters all input action callbacks via . + /// + /// public void RemoveCallbacks(ITileCreatorActions instance) { if (m_Wrapper.m_TileCreatorActionsCallbackInterfaces.Remove(instance)) UnregisterCallbacks(instance); } + /// + /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . + /// + /// + /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. + /// + /// + /// + /// public void SetCallbacks(ITileCreatorActions instance) { foreach (var item in m_Wrapper.m_TileCreatorActionsCallbackInterfaces) @@ -1670,6 +2144,9 @@ public void SetCallbacks(ITileCreatorActions instance) AddCallbacks(instance); } } + /// + /// Provides a new instance referencing this action map. + /// public TileCreatorActions @TileCreator => new TileCreatorActions(this); // Interactions @@ -1677,17 +2154,47 @@ public void SetCallbacks(ITileCreatorActions instance) private List m_InteractionsActionsCallbackInterfaces = new List(); private readonly InputAction m_Interactions_RunPrimary; private readonly InputAction m_Interactions_ViewInteractions; + /// + /// Provides access to input actions defined in input action map "Interactions". + /// public struct InteractionsActions { private @Controls m_Wrapper; + + /// + /// Construct a new instance of the input action map wrapper class. + /// public InteractionsActions(@Controls wrapper) { m_Wrapper = wrapper; } + /// + /// Provides access to the underlying input action "Interactions/RunPrimary". + /// public InputAction @RunPrimary => m_Wrapper.m_Interactions_RunPrimary; + /// + /// Provides access to the underlying input action "Interactions/ViewInteractions". + /// public InputAction @ViewInteractions => m_Wrapper.m_Interactions_ViewInteractions; + /// + /// Provides access to the underlying input action map instance. + /// public InputActionMap Get() { return m_Wrapper.m_Interactions; } + /// public void Enable() { Get().Enable(); } + /// public void Disable() { Get().Disable(); } + /// public bool enabled => Get().enabled; + /// + /// Implicitly converts an to an instance. + /// public static implicit operator InputActionMap(InteractionsActions set) { return set.Get(); } + /// + /// Adds , and callbacks provided via on all input actions contained in this map. + /// + /// Callback instance. + /// + /// If is null or have already been added this method does nothing. + /// + /// public void AddCallbacks(IInteractionsActions instance) { if (instance == null || m_Wrapper.m_InteractionsActionsCallbackInterfaces.Contains(instance)) return; @@ -1700,6 +2207,13 @@ public void AddCallbacks(IInteractionsActions instance) @ViewInteractions.canceled += instance.OnViewInteractions; } + /// + /// Removes , and callbacks provided via on all input actions contained in this map. + /// + /// + /// Calling this method when have not previously been registered has no side-effects. + /// + /// private void UnregisterCallbacks(IInteractionsActions instance) { @RunPrimary.started -= instance.OnRunPrimary; @@ -1710,12 +2224,25 @@ private void UnregisterCallbacks(IInteractionsActions instance) @ViewInteractions.canceled -= instance.OnViewInteractions; } + /// + /// Unregisters and unregisters all input action callbacks via . + /// + /// public void RemoveCallbacks(IInteractionsActions instance) { if (m_Wrapper.m_InteractionsActionsCallbackInterfaces.Remove(instance)) UnregisterCallbacks(instance); } + /// + /// Replaces all existing callback instances and previously registered input action callbacks associated with them with callbacks provided via . + /// + /// + /// If is null, calling this method will only unregister all existing callbacks but not register any new callbacks. + /// + /// + /// + /// public void SetCallbacks(IInteractionsActions instance) { foreach (var item in m_Wrapper.m_InteractionsActionsCallbackInterfaces) @@ -1724,63 +2251,323 @@ public void SetCallbacks(IInteractionsActions instance) AddCallbacks(instance); } } + /// + /// Provides a new instance referencing this action map. + /// public InteractionsActions @Interactions => new InteractionsActions(this); + /// + /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Camera" which allows adding and removing callbacks. + /// + /// + /// public interface ICameraActions { + /// + /// Method invoked when associated input action "Zoom" is either , or . + /// + /// + /// + /// void OnZoom(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Vertical Rotation" is either , or . + /// + /// + /// + /// void OnVerticalRotation(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Horizontal Rotation" is either , or . + /// + /// + /// + /// void OnHorizontalRotation(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Mouse Rotation" is either , or . + /// + /// + /// + /// void OnMouseRotation(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Snap Right" is either , or . + /// + /// + /// + /// void OnSnapRight(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Snap Left" is either , or . + /// + /// + /// + /// void OnSnapLeft(InputAction.CallbackContext context); } + /// + /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Movement" which allows adding and removing callbacks. + /// + /// + /// public interface IMovementActions { + /// + /// Method invoked when associated input action "Movement" is either , or . + /// + /// + /// + /// void OnMovement(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Toggle Run" is either , or . + /// + /// + /// + /// void OnToggleRun(InputAction.CallbackContext context); } + /// + /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Console" which allows adding and removing callbacks. + /// + /// + /// public interface IConsoleActions { + /// + /// Method invoked when associated input action "Open" is either , or . + /// + /// + /// + /// void OnOpen(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Close" is either , or . + /// + /// + /// + /// void OnClose(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Submit" is either , or . + /// + /// + /// + /// void OnSubmit(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Switch Command" is either , or . + /// + /// + /// + /// void OnSwitchCommand(InputAction.CallbackContext context); } + /// + /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Hotkeys" which allows adding and removing callbacks. + /// + /// + /// public interface IHotkeysActions { + /// + /// Method invoked when associated input action "Swap Hands" is either , or . + /// + /// + /// + /// void OnSwapHands(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Use" is either , or . + /// + /// + /// + /// void OnUse(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Drop" is either , or . + /// + /// + /// + /// void OnDrop(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Toggle Internal Clothing" is either , or . + /// + /// + /// + /// void OnToggleInternalClothing(InputAction.CallbackContext context); } + /// + /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Other" which allows adding and removing callbacks. + /// + /// + /// public interface IOtherActions { + /// + /// Method invoked when associated input action "Fade" is either , or . + /// + /// + /// + /// void OnFade(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Swap Minds" is either , or . + /// + /// + /// + /// void OnSwapMinds(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Primary Click" is either , or . + /// + /// + /// + /// void OnPrimaryClick(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Secondary Click" is either , or . + /// + /// + /// + /// void OnSecondaryClick(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Toggle Menu" is either , or . + /// + /// + /// + /// void OnToggleMenu(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Spawn Cans" is either , or . + /// + /// + /// + /// void OnSpawnCans(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Toggle Runtime Editor" is either , or . + /// + /// + /// + /// void OnToggleRuntimeEditor(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Ragdoll" is either , or . + /// + /// + /// + /// void OnRagdoll(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Attack" is either , or . + /// + /// + /// + /// void OnAttack(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "See Container Contents" is either , or . + /// + /// + /// + /// void OnSeeContainerContents(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Show Owner" is either , or . + /// + /// + /// + /// void OnShowOwner(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Toggle Selection Debug" is either , or . + /// + /// + /// + /// void OnToggleSelectionDebug(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "SendChatMessage" is either , or . + /// + /// + /// + /// void OnSendChatMessage(InputAction.CallbackContext context); } + /// + /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Tile Creator" which allows adding and removing callbacks. + /// + /// + /// public interface ITileCreatorActions { + /// + /// Method invoked when associated input action "Toggle Menu" is either , or . + /// + /// + /// + /// void OnToggleMenu(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Place" is either , or . + /// + /// + /// + /// void OnPlace(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Replace" is either , or . + /// + /// + /// + /// void OnReplace(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Rotate" is either , or . + /// + /// + /// + /// void OnRotate(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Delete" is either , or . + /// + /// + /// + /// void OnDelete(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "Square Drag" is either , or . + /// + /// + /// + /// void OnSquareDrag(InputAction.CallbackContext context); } + /// + /// Interface to implement callback methods for all input action callbacks associated with input actions defined by "Interactions" which allows adding and removing callbacks. + /// + /// + /// public interface IInteractionsActions { + /// + /// Method invoked when associated input action "Run Primary" is either , or . + /// + /// + /// + /// void OnRunPrimary(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "View Interactions" is either , or . + /// + /// + /// + /// void OnViewInteractions(InputAction.CallbackContext context); } } diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs index 4aa8518e8f..6b060eafb5 100644 --- a/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs +++ b/Assets/Scripts/SS3D/Systems/Inventory/Items/Item.cs @@ -152,7 +152,7 @@ protected override void OnStart() foreach (Animator animator in GetComponents()) { - animator.keepAnimatorControllerStateOnDisable = true; + animator.keepAnimatorStateOnDisable = true; } // Clients don't need to calculate physics for rigidbodies as this is handled by the server diff --git a/Assets/UI Toolkit/PanelSettings.asset b/Assets/UI Toolkit/PanelSettings.asset index f8a5242711..6e9e0c604f 100644 --- a/Assets/UI Toolkit/PanelSettings.asset +++ b/Assets/UI Toolkit/PanelSettings.asset @@ -15,6 +15,7 @@ MonoBehaviour: themeUss: {fileID: -4733365628477956816, guid: 9301c5ba7ff575a4b9c5763861c773b1, type: 3} m_TargetTexture: {fileID: 0} m_ScaleMode: 1 + m_ReferenceSpritePixelsPerUnit: 100 m_Scale: 1 m_ReferenceDpi: 96 m_FallbackDpi: 96 diff --git a/Packages/manifest.json b/Packages/manifest.json index a76f52ef59..c558c1e0f3 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,18 +5,20 @@ "com.handzlikchris.fastscriptreload": "https://github.com/handzlikchris/FastScriptReload.git?path=Assets", "com.johannesmp.unityscenereference": "1.1.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.collab-proxy": "1.17.7", - "com.unity.editorcoroutines": "1.0.0", - "com.unity.ide.rider": "3.0.28", - "com.unity.ide.visualstudio": "2.0.22", + "com.unity.ai.navigation": "1.1.7", + "com.unity.collab-proxy": "2.7.1", + "com.unity.editorcoroutines": "1.0.1", + "com.unity.ide.rider": "3.0.39", + "com.unity.ide.visualstudio": "2.0.26", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.4.4", - "com.unity.localization": "1.3.2", - "com.unity.postprocessing": "3.2.2", - "com.unity.shadergraph": "12.1.8", + "com.unity.inputsystem": "1.14.2", + "com.unity.localization": "1.5.9", + "com.unity.postprocessing": "3.4.0", + "com.unity.shadergraph": "14.0.12", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.toolchain.linux-x86_64": "2.0.2", + "com.unity.textmeshpro": "3.0.9", + "com.unity.toolchain.linux-x86_64": "2.0.11", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.11", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 5b8ae62d32..6fbaed8722 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -48,30 +48,38 @@ "dependencies": {} }, "com.unity.addressables": { - "version": "1.19.19", + "version": "1.25.0", "depth": 1, "source": "registry", "dependencies": { + "com.unity.test-framework": "1.1.33", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.scriptablebuildpipeline": "1.19.6", + "com.unity.scriptablebuildpipeline": "1.22.4", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.collab-proxy": { - "version": "1.17.7", + "com.unity.ai.navigation": { + "version": "1.1.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.core": "1.0.1" + "com.unity.modules.ai": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.collab-proxy": { + "version": "2.7.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.editorcoroutines": { - "version": "1.0.0", + "version": "1.0.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -85,7 +93,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.28", + "version": "3.0.39", "depth": 0, "source": "registry", "dependencies": { @@ -94,11 +102,11 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.26", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.33" }, "url": "https://packages.unity.com" }, @@ -110,7 +118,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.4", + "version": "1.14.2", "depth": 0, "source": "registry", "dependencies": { @@ -119,24 +127,24 @@ "url": "https://packages.unity.com" }, "com.unity.localization": { - "version": "1.3.2", + "version": "1.5.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.addressables": "1.19.19", - "com.unity.nuget.newtonsoft-json": "2.0.2" + "com.unity.addressables": "1.25.0", + "com.unity.nuget.newtonsoft-json": "3.0.2" }, "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.2", + "version": "3.4.0", "depth": 0, "source": "registry", "dependencies": { @@ -152,62 +160,55 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.8", + "version": "14.0.12", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.0.0", "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.scriptablebuildpipeline": { - "version": "1.20.1", + "version": "1.22.4", "depth": 2, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.1.33", + "com.unity.modules.assetbundle": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.services.core": { - "version": "1.6.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.modules.androidjni": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.unitywebrequest": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.shadergraph": { - "version": "12.1.8", + "version": "14.0.12", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.8", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.12", + "com.unity.searcher": "4.9.2" } }, "com.unity.sysroot": { - "version": "2.0.3", + "version": "2.0.10", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "2.0.2", + "version": "2.0.9", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "2.0.3" + "com.unity.sysroot": "2.0.10" }, "url": "https://packages.unity.com" }, @@ -223,7 +224,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.9", "depth": 0, "source": "registry", "dependencies": { @@ -232,12 +233,22 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.linux-x86_64": { - "version": "2.0.2", + "version": "2.0.11", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.toolchain.win-x86_64-linux-x86_64": { + "version": "2.0.11", "depth": 0, "source": "registry", "dependencies": { - "com.unity.sysroot": "2.0.3", - "com.unity.sysroot.linux-x86_64": "2.0.2" + "com.unity.sysroot": "2.0.10", + "com.unity.sysroot.linux-x86_64": "2.0.9" }, "url": "https://packages.unity.com" }, @@ -382,17 +393,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 43369e3c51..10c625bb66 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -28,6 +28,7 @@ GraphicsSettings: m_LensFlare: m_Mode: 1 m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0} + m_VideoShadersIncludeMode: 2 m_AlwaysIncludedShaders: - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0} @@ -36,8 +37,8 @@ GraphicsSettings: - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] - m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, - type: 0} + m_PreloadShadersBatchTimeLimit: -1 + m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 0} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} @@ -59,5 +60,8 @@ GraphicsSettings: m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 0 + m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 - m_AllowEnlightenSupportForUpgradedProject: 0 + m_SRPDefaultSettings: {} + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 94f297230d..7f94a9a356 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 26 productGUID: 22b2c897063c2e848acae4afaf1df009 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -50,14 +50,16 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -76,6 +78,8 @@ PlayerSettings: androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -83,10 +87,12 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -121,8 +127,12 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 stadiaPresentMode: 0 stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 @@ -130,12 +140,9 @@ PlayerSettings: vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 bundleVersion: 0.0.7.6 preloadedAssets: - {fileID: 11400000, guid: b60ebf47fee797845ac53b5122978922, type: 2} @@ -157,8 +164,9 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -169,6 +177,7 @@ PlayerSettings: Standalone: com.CentCom-Softworks.SS3D buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 @@ -186,12 +195,17 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 0 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -234,13 +248,16 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -255,6 +272,7 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 AndroidTargetDevices: 0 @@ -262,6 +280,7 @@ PlayerSettings: androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 @@ -275,7 +294,6 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 @@ -368,7 +386,9 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 @@ -381,6 +401,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -388,10 +409,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -465,7 +487,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -507,6 +528,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -517,7 +539,7 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 @@ -607,6 +629,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -619,6 +642,12 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: Android: UNITY_POST_PROCESSING_STACK_V2 @@ -629,8 +658,10 @@ PlayerSettings: Nintendo Switch: UNITY_POST_PROCESSING_STACK_V2 PS4: UNITY_POST_PROCESSING_STACK_V2 PS5: UNITY_POST_PROCESSING_STACK_V2 + QNX: UNITY_POST_PROCESSING_STACK_V2 Stadia: UNITY_POST_PROCESSING_STACK_V2 Standalone: UNITY_POST_PROCESSING_STACK_V2;FISHNET;FISHNET_V3;DISABLE_QOL_ATTRIBUTES + VisionOS: UNITY_POST_PROCESSING_STACK_V2 WebGL: UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2 XboxOne: UNITY_POST_PROCESSING_STACK_V2 @@ -638,19 +669,31 @@ PlayerSettings: additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: - Standalone: 0 + Server: 1 + Standalone: 1 il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -676,6 +719,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: {} metroTargetDeviceFamilies: {} metroFTAName: @@ -723,7 +767,12 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: - apiCompatibilityLevel: 6 + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: + apiCompatibilityLevel: 3 activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: @@ -733,6 +782,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index eabd633779..587f809d71 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2022.3.62f3 +m_EditorVersionWithRevision: 2022.3.62f3 (96770f904ca7) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 9b28428b92..486aaba598 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 2048 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/SS3D.slnx b/SS3D.slnx new file mode 100644 index 0000000000..73c87f417a --- /dev/null +++ b/SS3D.slnx @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +