diff --git a/Assets/Scenes/ConnectionScene.unity b/Assets/Scenes/ConnectionScene.unity index 09f6597..487d97a 100644 --- a/Assets/Scenes/ConnectionScene.unity +++ b/Assets/Scenes/ConnectionScene.unity @@ -4113,7 +4113,7 @@ GameObject: - component: {fileID: 1932428198} - component: {fileID: 1932428202} m_Layer: 5 - m_Name: UI + m_Name: ---UI--- m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4807,9 +4807,9 @@ CanvasRenderer: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1507724382} - {fileID: 2063328965} - - {fileID: 1831631960} + - {fileID: 1507724382} - {fileID: 1932428201} - {fileID: 1414786105} - {fileID: 56200106} + - {fileID: 1831631960} diff --git a/Assets/Scenes/TD_Scene.unity b/Assets/Scenes/TD_Scene.unity index cda2188..04ab924 100644 --- a/Assets/Scenes/TD_Scene.unity +++ b/Assets/Scenes/TD_Scene.unity @@ -559,8 +559,8 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: + - {fileID: 937775009} - {fileID: 330585546} - {fileID: 410087041} - {fileID: 832575519} - - {fileID: 937775009} - {fileID: 1798493389} diff --git a/Assets/Scripts/Client/ClientRequestGameEntrySystem.cs b/Assets/Scripts/Client/ClientRequestGameEntrySystem.cs index 3469345..26e7805 100644 --- a/Assets/Scripts/Client/ClientRequestGameEntrySystem.cs +++ b/Assets/Scripts/Client/ClientRequestGameEntrySystem.cs @@ -50,7 +50,7 @@ namespace Client }); } - //Broadcast Rpc + //Broadcast Rpc - playback disposes of ecb ecb.Playback(state.EntityManager); } } diff --git a/Assets/Scripts/Common/CharacterComponents.cs b/Assets/Scripts/Common/CharacterComponents.cs index 83de9b9..2535e5b 100644 --- a/Assets/Scripts/Common/CharacterComponents.cs +++ b/Assets/Scripts/Common/CharacterComponents.cs @@ -17,4 +17,9 @@ namespace Common { [GhostField] public TeamType Value; } + + public struct LocalInitialized : IComponentData + { + + } } \ No newline at end of file diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index bfe8999..244d7f3 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -54,18 +54,9 @@ MonoBehaviour: - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 7930710930656067584 + - rid: 4055230942537842688 m_RuntimeSettings: - m_List: - - rid: 6852985685364965378 - - rid: 6852985685364965379 - - rid: 6852985685364965380 - - rid: 6852985685364965381 - - rid: 6852985685364965384 - - rid: 6852985685364965385 - - rid: 6852985685364965392 - - rid: 6852985685364965394 - - rid: 8712630790384254976 - - rid: 7930710930656067584 + m_List: [] m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -96,6 +87,10 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: 4055230942537842688 + type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - rid: 6852985685364965376 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -168,6 +163,7 @@ MonoBehaviour: m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - rid: 6852985685364965384 type: {class: URPDefaultVolumeProfileSettings, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: diff --git a/Packages/manifest.json b/Packages/manifest.json index 6e524e0..fddffb8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,7 +6,7 @@ "com.unity.entities.graphics": "1.3.2", "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.inputsystem": "1.11.2", + "com.unity.inputsystem": "1.12.0", "com.unity.multiplayer.center": "1.0.0", "com.unity.netcode": "1.3.6", "com.unity.render-pipelines.universal": "17.0.3", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 3ea51bd..6c4388a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -109,7 +109,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.11.2", + "version": "1.12.0", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 54a59af..7f0a536 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.29f1 -m_EditorVersionWithRevision: 6000.0.29f1 (9fafe5c9db65) +m_EditorVersion: 6000.0.36f1 +m_EditorVersionWithRevision: 6000.0.36f1 (9fe3b5f71dbb)