Dev/ScriptableObjectsRefactor #4

Merged
Stedd merged 17 commits from Dev/ScriptableObjectsRefactor into master 2024-10-05 17:34:01 +02:00
7 changed files with 33 additions and 21 deletions
Showing only changes of commit 369c32fe71 - Show all commits

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.7.0 // version 1.11.0
// from Assets/InputSystem/CameraControllActions.inputactions // from Assets/InputSystem/CameraControllActions.inputactions
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
@ -145,6 +145,11 @@ public partial class @CameraControllActions: IInputActionCollection2, IDisposabl
m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true); m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true);
} }
~@CameraControllActions()
{
UnityEngine.Debug.Assert(!m_Camera.enabled, "This will cause a leak and performance issues, CameraControllActions.Camera.Disable() has not been called.");
}
public void Dispose() public void Dispose()
{ {
UnityEngine.Object.Destroy(asset); UnityEngine.Object.Destroy(asset);

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator // This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.7.0 // version 1.11.0
// from Assets/InputSystem/HandlerControls.inputactions // from Assets/InputSystem/HandlerControls.inputactions
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
@ -921,6 +921,12 @@ namespace AsteroidGame
m_UI_TrackedDeviceOrientation = m_UI.FindAction("TrackedDeviceOrientation", throwIfNotFound: true); m_UI_TrackedDeviceOrientation = m_UI.FindAction("TrackedDeviceOrientation", throwIfNotFound: true);
} }
~@HandlerControls()
{
UnityEngine.Debug.Assert(!m_Player.enabled, "This will cause a leak and performance issues, HandlerControls.Player.Disable() has not been called.");
UnityEngine.Debug.Assert(!m_UI.enabled, "This will cause a leak and performance issues, HandlerControls.UI.Disable() has not been called.");
}
public void Dispose() public void Dispose()
{ {
UnityEngine.Object.Destroy(asset); UnityEngine.Object.Destroy(asset);

View File

@ -2,14 +2,14 @@
"dependencies": { "dependencies": {
"com.unity.ai.navigation": "1.1.5", "com.unity.ai.navigation": "1.1.5",
"com.unity.feature.development": "1.0.1", "com.unity.feature.development": "1.0.1",
"com.unity.ide.rider": "3.0.25", "com.unity.ide.rider": "3.0.31",
"com.unity.ide.visualstudio": "2.0.21", "com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5", "com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.7.0", "com.unity.inputsystem": "1.11.0",
"com.unity.render-pipelines.high-definition": "14.0.8", "com.unity.render-pipelines.high-definition": "14.0.11",
"com.unity.test-framework": "1.1.33", "com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6", "com.unity.textmeshpro": "3.0.7",
"com.unity.timeline": "1.7.5", "com.unity.timeline": "1.7.6",
"com.unity.toolchain.linux-x86_64": "2.0.9", "com.unity.toolchain.linux-x86_64": "2.0.9",
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",
"com.unity.ui": "2.0.0", "com.unity.ui": "2.0.0",

View File

@ -49,7 +49,7 @@
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "3.0.31", "version": "3.0.31",
"depth": 1, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.ext.nunit": "1.0.6" "com.unity.ext.nunit": "1.0.6"
@ -58,7 +58,7 @@
}, },
"com.unity.ide.visualstudio": { "com.unity.ide.visualstudio": {
"version": "2.0.22", "version": "2.0.22",
"depth": 1, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
"com.unity.test-framework": "1.1.9" "com.unity.test-framework": "1.1.9"
@ -73,7 +73,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.inputsystem": { "com.unity.inputsystem": {
"version": "1.7.0", "version": "1.11.0",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -107,7 +107,7 @@
} }
}, },
"com.unity.render-pipelines.high-definition": { "com.unity.render-pipelines.high-definition": {
"version": "14.0.8", "version": "14.0.11",
"depth": 0, "depth": 0,
"source": "builtin", "source": "builtin",
"dependencies": { "dependencies": {
@ -192,7 +192,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "3.0.6", "version": "3.0.7",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
@ -201,7 +201,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.7.5", "version": "1.7.6",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {

View File

@ -3,7 +3,7 @@
--- !u!30 &1 --- !u!30 &1
GraphicsSettings: GraphicsSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 14 serializedVersion: 15
m_Deferred: m_Deferred:
m_Mode: 1 m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@ -13,9 +13,6 @@ GraphicsSettings:
m_ScreenSpaceShadows: m_ScreenSpaceShadows:
m_Mode: 1 m_Mode: 1
m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
m_LegacyDeferred:
m_Mode: 1
m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
m_DepthNormals: m_DepthNormals:
m_Mode: 1 m_Mode: 1
m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
@ -48,6 +45,7 @@ GraphicsSettings:
m_LightmapStripping: 0 m_LightmapStripping: 0
m_FogStripping: 0 m_FogStripping: 0
m_InstancingStripping: 0 m_InstancingStripping: 0
m_BrgStripping: 0
m_LightmapKeepPlain: 1 m_LightmapKeepPlain: 1
m_LightmapKeepDirCombined: 1 m_LightmapKeepDirCombined: 1
m_LightmapKeepDynamicPlain: 1 m_LightmapKeepDynamicPlain: 1
@ -64,3 +62,6 @@ GraphicsSettings:
m_LogWhenShaderIsCompiled: 0 m_LogWhenShaderIsCompiled: 0
m_SRPDefaultSettings: m_SRPDefaultSettings:
UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: f586bf21bdc18374fa13455942bba5cc, type: 2} UnityEngine.Rendering.HighDefinition.HDRenderPipeline: {fileID: 11400000, guid: f586bf21bdc18374fa13455942bba5cc, type: 2}
m_LightProbeOutsideHullStrategy: 0
m_CameraRelativeLightCulling: 0
m_CameraRelativeShadowCulling: 0

View File

@ -350,7 +350,7 @@ PlayerSettings:
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: LinuxStandaloneSupport - m_BuildTarget: LinuxStandaloneSupport
m_APIs: 1100000015000000 m_APIs: 15000000
m_Automatic: 0 m_Automatic: 0
m_BuildTargetVRSettings: m_BuildTargetVRSettings:
- m_BuildTarget: Standalone - m_BuildTarget: Standalone

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2022.3.10f1 m_EditorVersion: 2022.3.49f1
m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) m_EditorVersionWithRevision: 2022.3.49f1 (4dae1bb8668d)