Dev/ScriptableObjectsRefactor #4

Merged
Stedd merged 17 commits from Dev/ScriptableObjectsRefactor into master 2024-10-05 17:34:01 +02:00
3 changed files with 20 additions and 18 deletions
Showing only changes of commit 9e0304fe93 - Show all commits

@ -1 +1 @@
Subproject commit b031ed3db7b4a08253cf5fcf25059ad299fddaa0 Subproject commit 4005878930047e686a5efbd876ebee4cb3d97442

View File

@ -17,7 +17,7 @@ namespace AsteroidGame.Entities
[SerializeField] private SoPowerSystemRuntimeSet _powerBaseSet; [SerializeField] private SoPowerSystemRuntimeSet _powerBaseSet;
public void SetConfig(SoPowerConfig config) public void Initialize(SoPowerConfig config)
{ {
_isGenerator = config.isGenerator; _isGenerator = config.isGenerator;
_isConsumer = config.isConsumer; _isConsumer = config.isConsumer;
@ -26,11 +26,6 @@ namespace AsteroidGame.Entities
_powerBaseSet.Add(this); _powerBaseSet.Add(this);
} }
private void OnEnable()
{
_powerBaseSet.Add(this);
}
private void OnDisable() private void OnDisable()
{ {
_powerBaseSet.Remove(this); _powerBaseSet.Remove(this);

View File

@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 262.33694, g: 325.04984, b: 430.2193, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -336,7 +335,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} - target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
@ -1043,7 +1042,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3} - target: {fileID: 5599539567497807159, guid: 4af571b983b23f94f8d5ca4dbda27de5, type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
@ -1486,6 +1485,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3} m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Version: 11
m_ObsoleteShadowResolutionTier: 1
m_ObsoleteUseShadowQualitySettings: 0
m_ObsoleteCustomShadowResolution: 512
m_ObsoleteContactShadows: 0
m_PointlightHDType: 0
m_SpotLightShape: 0
m_AreaLightShape: 0
m_Intensity: 100000 m_Intensity: 100000
m_EnableSpotReflector: 1 m_EnableSpotReflector: 1
m_LuxAtDistance: 1 m_LuxAtDistance: 1
@ -1588,14 +1595,6 @@ MonoBehaviour:
m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
m_AreaLightEmissiveMeshLayer: -1 m_AreaLightEmissiveMeshLayer: -1
m_Version: 11
m_ObsoleteShadowResolutionTier: 1
m_ObsoleteUseShadowQualitySettings: 0
m_ObsoleteCustomShadowResolution: 512
m_ObsoleteContactShadows: 0
m_PointlightHDType: 0
m_SpotLightShape: 0
m_AreaLightShape: 0
--- !u!4 &2079460687 stripped --- !u!4 &2079460687 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3} m_CorrespondingSourceObject: {fileID: 8324879816836607384, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
@ -1653,6 +1652,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Turret value: Turret
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8704396752535238434, guid: 534f8d15e0c83c646887bebfda2bdfd6, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
@ -1966,6 +1969,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: PowerPlant value: PowerPlant
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1134055636167264334, guid: 57a75520298c47140a928041b05d7f3c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []