Compare commits

...

7 Commits

Author SHA1 Message Date
Stedd af8e183f93 gitignore 2023-10-08 14:57:57 +02:00
Stedd 0a67caf9be Changed namespaces 2023-10-08 14:54:36 +02:00
Stedd 1bb9d584dd moved interfaces to CoreSystems 2023-10-08 14:07:18 +02:00
Stedd 357e02ff4f Changed naming scheme of ScriptableObjects 2023-10-08 14:06:15 +02:00
Stedd 35d80db948 Added submodule 2023-10-08 13:14:17 +02:00
Stedd d4aabafbdf Updated and removed some packages 2023-10-08 13:04:33 +02:00
Stedd ce40da5de0 Unity 2022.3.10 2023-10-08 13:01:21 +02:00
88 changed files with 1100 additions and 842 deletions

1
.gitignore vendored
View File

@ -74,3 +74,4 @@ crashlytics-build.properties
game_notes/.obsidian
.idea/.idea.AsteroidGame/.idea/dictionaries
.idea

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "Assets/CoreSystems"]
path = Assets/CoreSystems
url = https://gitea.strixhab.net/Stedd/GameDev.CoreSystems.git

View File

@ -1,13 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/projectSettingsUpdater.xml
/modules.xml
/.idea.AsteroidGame.iml
/contentModel.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
@ -25,6 +25,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Blue_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _NORMALMAP_TANGENT_SPACE
@ -40,6 +42,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -151,6 +154,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -180,6 +187,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -236,6 +245,8 @@ Material:
- _Mode: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OcclusionStrength: 1
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
@ -262,9 +273,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -272,6 +283,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0

View File

@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: GreyBlue_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _NORMALMAP_TANGENT_SPACE
@ -24,6 +26,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -135,6 +138,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -164,6 +171,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -220,6 +229,8 @@ Material:
- _Mode: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OcclusionStrength: 1
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
@ -246,9 +257,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -256,6 +267,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0
@ -303,7 +315,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:

View File

@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: GridBlue_01_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _EMISSIVE_COLOR_MAP
@ -26,6 +28,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -137,6 +140,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -166,6 +173,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -222,6 +231,8 @@ Material:
- _Mode: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OcclusionStrength: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
@ -248,9 +259,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -258,6 +269,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0
@ -305,7 +317,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
@ -25,6 +25,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: GridOrange_01_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _EMISSIVE_COLOR_MAP
@ -42,6 +44,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -153,6 +156,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -182,6 +189,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -238,6 +247,8 @@ Material:
- _Mode: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OcclusionStrength: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
@ -264,9 +275,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -274,6 +285,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
@ -25,6 +25,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: GridWhite_01_Mat
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _EMISSIVE_COLOR_MAP
@ -42,6 +44,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -153,6 +156,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -182,6 +189,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -238,6 +247,8 @@ Material:
- _Mode: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OcclusionStrength: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
@ -264,9 +275,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -274,6 +285,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0

View File

@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: ShaderGraphGrid_01_Mat
m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_DECALS
- _DISABLE_SSR_TRANSPARENT
@ -23,6 +25,7 @@ Material:
- TransparentDepthPostpass
- TransparentBackface
- RayTracingPrepass
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -174,7 +177,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:

View File

@ -7,7 +7,8 @@
"GUID:f008ecc6829887e478aeb5eb004eb01b",
"GUID:17a5862fcd6383b4b97bad4dcb1e2e5d",
"GUID:f26d68a0bdefa1043b120b820f55e190",
"GUID:eb3099ff524d60545a136315a154d67b"
"GUID:eb3099ff524d60545a136315a154d67b",
"GUID:5d38ea13ae8f69a4395d425d401a557a"
],
"includePlatforms": [],
"excludePlatforms": [],

1
Assets/CoreSystems Submodule

@ -0,0 +1 @@
Subproject commit c473d58817fa7c0cdd6d6f488cf6c8b9ffd5c52e

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b20f0794cd5868b4eadf6614b8ab88b9
guid: 1ddd6c48e06694441adea0f979e2d194
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -23,6 +23,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 631532845000205954}
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}
@ -32,7 +33,6 @@ Transform:
- {fileID: 91949040360545666}
- {fileID: 8001059947964412310}
m_Father: {fileID: 7780103704517281592}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &700493555145955010
GameObject:
@ -57,6 +57,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 700493555145955010}
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}
@ -65,8 +66,54 @@ Transform:
- {fileID: 1671077540319194627}
- {fileID: 3955427233603104958}
m_Father: {fileID: 3291032053430181389}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1312307913408260796
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4626427865743511805}
- component: {fileID: 4299120351774448665}
m_Layer: 0
m_Name: Damageable
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4626427865743511805
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1312307913408260796}
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: 5123077350175375293}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4299120351774448665
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1312307913408260796}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a845ca774f1a2d341b32451b100c0d1c, type: 3}
m_Name:
m_EditorClassIdentifier:
<CurrentHealth>k__BackingField: 0
<MaxHealth>k__BackingField: 0
<IsInvulnerable>k__BackingField: 0
--- !u!1 &1856154329861502355
GameObject:
m_ObjectHideFlags: 0
@ -92,13 +139,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1856154329861502355}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0.341, y: 0, z: 0.587}
m_LocalScale: {x: 0.24, y: 0.4597677, z: 0.19977282}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5355765884551595638}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
--- !u!33 &4938033185760690219
MeshFilter:
@ -150,6 +197,39 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1900887375425358919
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5123077350175375293}
m_Layer: 0
m_Name: Functions
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5123077350175375293
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1900887375425358919}
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:
- {fileID: 4626427865743511805}
- {fileID: 3486364872742429245}
m_Father: {fileID: 2692714622321691895}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3867128990362458971
GameObject:
m_ObjectHideFlags: 0
@ -175,13 +255,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3867128990362458971}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.536, y: 0.206, z: -0.193}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 91949040360545666}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8811483340839899384
MeshFilter:
@ -257,13 +337,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4192276824634724634}
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: 3291032053430181389}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &5604178963170827772
BoxCollider:
@ -273,9 +353,17 @@ BoxCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4192276824634724634}
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: 1.3168308, y: 1, z: 1.3902934}
m_Center: {x: 0.15841538, y: 0, z: -0.0017904043}
--- !u!1 &4921375452445824178
@ -303,13 +391,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4921375452445824178}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.536, y: 0.206, z: 0.205}
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 91949040360545666}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &274824493129163367
MeshFilter:
@ -361,6 +449,53 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &5367121395816538489
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3486364872742429245}
- component: {fileID: 4691274110434226497}
m_Layer: 0
m_Name: Targetable
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3486364872742429245
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5367121395816538489}
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: 5123077350175375293}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4691274110434226497
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5367121395816538489}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a845ca774f1a2d341b32451b100c0d1c, type: 3}
m_Name:
m_EditorClassIdentifier:
<CurrentHealth>k__BackingField: 0
<MaxHealth>k__BackingField: 0
<IsInvulnerable>k__BackingField: 0
--- !u!1 &5599539567497807159
GameObject:
m_ObjectHideFlags: 0
@ -385,14 +520,15 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5599539567497807159}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 191376514769192977}
- {fileID: 5123077350175375293}
- {fileID: 4114072049224310043}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1411216412654489461
MonoBehaviour:
@ -418,6 +554,38 @@ MonoBehaviour:
_targeter: {fileID: 0}
_target: {fileID: 0}
_navMeshAgent: {fileID: 0}
--- !u!1 &6015068770338930083
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4114072049224310043}
m_Layer: 0
m_Name: Rig
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4114072049224310043
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6015068770338930083}
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:
- {fileID: 191376514769192977}
m_Father: {fileID: 2692714622321691895}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6940800288144322101
GameObject:
m_ObjectHideFlags: 0
@ -441,14 +609,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6940800288144322101}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 2.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7780103704517281592}
m_Father: {fileID: 2692714622321691895}
m_RootOrder: 0
m_Father: {fileID: 4114072049224310043}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7089677990206923544
GameObject:
@ -473,6 +641,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7089677990206923544}
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}
@ -480,7 +649,6 @@ Transform:
m_Children:
- {fileID: 3291032053430181389}
m_Father: {fileID: 191376514769192977}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8831453991117079309
GameObject:
@ -507,6 +675,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8831453991117079309}
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}
@ -515,7 +684,6 @@ Transform:
- {fileID: 7956298909069556562}
- {fileID: 4518982824339893338}
m_Father: {fileID: 3291032053430181389}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5128498621595353232
MeshFilter:
@ -592,13 +760,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8931538593362537433}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0.34100002, y: 0, z: -0.603}
m_LocalScale: {x: 0.24, y: 0.4597677, z: 0.19977282}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 5355765884551595638}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
--- !u!33 &6582230243926515993
MeshFilter:

View File

@ -1,4 +1,5 @@
using System;
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;
using UnityEngine.AI;
@ -6,21 +7,23 @@ namespace AsteroidGame.Entities
{
public class EnemyBase : EntityBase
{
[SerializeField] private SEntityBaseRuntimeSet _enemyBaseSet;
[SerializeField] private SoEntityBaseRuntimeSet _enemyBaseSet;
[Header("Targeter")]
[SerializeField] private STargeterConfig _targeterConfig;
[SerializeField] private Targeter _targeter;
[SerializeField] private EntityBase _target;
[field: Header("Targeter")]
[SerializeField] private SoTargeterConfig _targeterConfig;
[field: SerializeField] public Targeter Targeter { get; set; }
[Header("NavMeshAgent")]
[field: Header("NavMeshAgent")]
[SerializeField] private NavMeshAgent _navMeshAgent;
protected override void OnEnable()
{
base.OnEnable();
_enemyBaseSet.Add(this);
InitializeTargeter();
InitializeNavMeshAgent();
}
@ -32,9 +35,9 @@ namespace AsteroidGame.Entities
private void InitializeTargeter()
{
_targeter = gameObject.AddComponent<Targeter>();
_targeter.SetParent(this);
_targeter.SetConfig(_targeterConfig);
Targeter = gameObject.AddComponent<Targeter>();
Targeter.SetParent(this);
Targeter.SetConfig(_targeterConfig);
}
protected override void OnDisable()
@ -45,11 +48,10 @@ namespace AsteroidGame.Entities
private void Update()
{
if (_targeter.FoundTarget())
{
_target = _targeter.GetTarget();
_navMeshAgent.SetDestination(_target.GetBasePosition());
}
if (!Targeter.FoundTarget()) return;
Target = Targeter.GetTarget();
_navMeshAgent.SetDestination(_target.GetBasePosition());
}
}
}

View File

@ -2,8 +2,7 @@
"name": "Entities",
"rootNamespace": "AsteroidGame",
"references": [
"GUID:17a5862fcd6383b4b97bad4dcb1e2e5d",
"GUID:eb3099ff524d60545a136315a154d67b"
"GUID:5d38ea13ae8f69a4395d425d401a557a"
],
"includePlatforms": [],
"excludePlatforms": [],

View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Name: newEnemyBaseRuntimeSet
m_EditorClassIdentifier:
_list: []

View File

@ -1,7 +1,8 @@
fileFormatVersion: 2
guid: 17a5862fcd6383b4b97bad4dcb1e2e5d
AssemblyDefinitionImporter:
guid: d681acab3b5d24f458e9c1c281d375cb
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,11 +0,0 @@
using AsteroidGame.Entities.Enemies.Scripts;
using AsteroidGame.ScriptableObjects;
using UnityEngine;
namespace AsteroidGame.Entities
{
[CreateAssetMenu(fileName = "newEnemyBaseRuntimeSet", menuName = "RuntimeSet/EnemyBase")]
public class SEnemyBaseRuntimeSet : SRuntimeSet<EnemyBase>
{
}
}

View File

@ -1,10 +0,0 @@
using AsteroidGame.ScriptableObjects;
using UnityEngine;
namespace AsteroidGame.Entities
{
[CreateAssetMenu(fileName = "newEntityBaseRuntimeSet", menuName = "RuntimeSet/EntityBase")]
public class SEntityBaseRuntimeSet : SRuntimeSet<EntityBase>
{
}
}

View File

@ -1,10 +0,0 @@
using AsteroidGame.ScriptableObjects;
using UnityEngine;
namespace AsteroidGame.Entities
{
[CreateAssetMenu(fileName = "newPowerBaseRuntimeSet", menuName = "RuntimeSet/PowerBase")]
public class SPowerBaseRuntimeSet : SRuntimeSet<PowerBase>
{
}
}

View File

@ -1,10 +0,0 @@
using AsteroidGame.ScriptableObjects;
using UnityEngine;
namespace AsteroidGame.Entities
{
[CreateAssetMenu(fileName = "newStructureBaseRuntimeSet", menuName = "RuntimeSet/StructureBase")]
public class SStructureBaseRuntimeSet : SRuntimeSet<StructureBase>
{
}
}

View File

@ -1,11 +1,11 @@
using System.Collections.Generic;
using AsteroidGame.Entities.Enemies.Scripts;
using AsteroidGame.Entities;
using UnityEngine;
namespace AsteroidGame.Entities
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newEnemyList", menuName = "Enemies/EnemyList")]
public class SEnemyBaseList : ScriptableObject
public class SoEnemyBaseList : ScriptableObject
{
public List<EnemyBase> _list;
}

View File

@ -0,0 +1,11 @@
using AsteroidGame.Entities;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newEnemyBaseRuntimeSet", menuName = "RuntimeSet/EnemyBase")]
public class SoEnemyBaseRuntimeSet : SRuntimeSet<EnemyBase>
{
}
}

View File

@ -0,0 +1,11 @@
using AsteroidGame.Entities;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newEntityBaseRuntimeSet", menuName = "RuntimeSet/EntityBase")]
public class SoEntityBaseRuntimeSet : SRuntimeSet<EntityBase>
{
}
}

View File

@ -0,0 +1,11 @@
using AsteroidGame.Entities;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newPowerBaseRuntimeSet", menuName = "RuntimeSet/PowerBase")]
public class SoPowerBaseRuntimeSet : SRuntimeSet<PowerBase>
{
}
}

View File

@ -1,12 +1,11 @@
using AsteroidGame.Interfaces;
using UnityEngine;
namespace AsteroidGame.Entities
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newPowerConfiguration", menuName = "Configuration/Power")]
public class SPowerConfig : ScriptableObject
public class SoPowerConfig : ScriptableObject
{
public SPowerBaseRuntimeSet _activePowerStructures;
public SoPowerBaseRuntimeSet _activePowerStructures;
public bool isGenerator;
public bool isConsumer;
public int maxPower;

View File

@ -1,10 +1,11 @@
using System.Collections.Generic;
using AsteroidGame.Entities;
using UnityEngine;
namespace AsteroidGame.Entities
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newStructureList", menuName = "Structures/StructureList")]
public class SStructureBaseList : ScriptableObject
public class SoStructureBaseList : ScriptableObject
{
public List<StructureBase> _structureList;
}

View File

@ -0,0 +1,11 @@
using AsteroidGame.Entities;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newStructureBaseRuntimeSet", menuName = "RuntimeSet/StructureBase")]
public class SoStructureBaseRuntimeSet : SRuntimeSet<StructureBase>
{
}
}

View File

@ -1,14 +1,15 @@
using AsteroidGame.Interfaces;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.Entities
namespace AsteroidGame.ScriptableObjects
{
[CreateAssetMenu(fileName = "newTargeterConfiguration", menuName = "Configuration/Targeter")]
public class STargeterConfig : ScriptableObject
public class SoTargeterConfig : ScriptableObject
{
public float _range;
public TargetStrategy _selectedTargetStrategy;
public SEntityBaseRuntimeSet _activeEntities;
public SoTargetableRuntimeSet _activeEntities;
public enum TargetStrategy
{
LowestRange,

View File

@ -1,9 +1,9 @@
using AsteroidGame.Interfaces;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.Entities
namespace AsteroidGame.ScriptableObjects
{
public class SWeaponConfig : ScriptableObject, IWeapon
public class SoWeaponConfig : ScriptableObject, IWeapon
{
[SerializeField] private float _fireRate;
[SerializeField] private float _damage;

View File

@ -1,28 +1,25 @@
using AsteroidGame.Interfaces;
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.Entities
{
public class EntityBase : MonoBehaviour, IDamageable, ITargetable
public class EntityBase : MonoBehaviour
{
[Header("Health")]
[SerializeField] protected int _health;
[SerializeField] protected int _maxHealth;
[SerializeField] protected bool _isInvulnerable;
[field: Header("Damageable")]
[field: SerializeField] public Damageable Damageable { get; set; }
[Header("TargetPositions")]
[SerializeField] private Transform _centerPosition;
[SerializeField] private Transform _basePosition;
[field: Header("Targetable")]
[field: SerializeField] public Targetable Targetable { get; set; }
[Header("UI")]
[SerializeField] protected string _uiFriendlyName;
[Space]
[SerializeField] private SEntityBaseRuntimeSet _entityBaseSet;
[SerializeField] private SoEntityBaseRuntimeSet _entityBaseSet;
#region Props
public bool IsInvulnerable => _isInvulnerable;
public string UiFriendlyName => _uiFriendlyName;
#endregion
@ -30,6 +27,10 @@ namespace AsteroidGame.Entities
protected virtual void OnEnable()
{
_entityBaseSet.Add(this);
InitializeDamageable();
InitializeTargetable();
}
protected virtual void OnDisable()
@ -37,40 +38,14 @@ namespace AsteroidGame.Entities
_entityBaseSet.Remove(this);
}
#region Methods
public void ModifyHealth(int healthChange)
private void InitializeTargetable()
{
if (!_isInvulnerable)
{
_health += healthChange;
}
Targetable = gameObject.AddComponent<Targetable>();
}
#endregion
#region Setters
public void SetHealth(int newHealth) => _health = newHealth;
public void SetMaxHealth(int newHealth) => _maxHealth = newHealth;
public void SetInvulnerable(bool newState) => _isInvulnerable = newState;
#endregion
#region Getters
public Vector3 GetCenterPosition() => _centerPosition.transform.position;
public Vector3 GetBasePosition() => _basePosition.transform.position;
public int GetHealth() => _health;
public int GetMaxHealth() => _maxHealth;
public float GetHealthFactor() => (float)_health / (float)_maxHealth;
#endregion
private void InitializeDamageable()
{
Damageable = gameObject.AddComponent<Damageable>();
}
}
}

View File

@ -1,5 +1,5 @@
using System;
using AsteroidGame.Interfaces;
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.Entities
@ -12,7 +12,7 @@ namespace AsteroidGame.Entities
[SerializeField] protected int _maxPower;
[SerializeField] protected int _currentPower;
public void SetConfig(SPowerConfig config)
public void SetConfig(SoPowerConfig config)
{
_isGenerator = config.isGenerator;
_isConsumer = config.isConsumer;

View File

@ -1,3 +1,5 @@
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.Entities
@ -5,21 +7,21 @@ namespace AsteroidGame.Entities
public class Targeter : MonoBehaviour
{
[SerializeField] private float _range;
[SerializeField] private STargeterConfig.TargetStrategy _targetStrategy;
[SerializeField] private SEntityBaseRuntimeSet _activeEntities;
[SerializeField] private EntityBase _targeterParent;
[SerializeField] private EntityBase _targetEntity;
[SerializeField] private SoTargeterConfig.TargetStrategy _targetStrategy;
[SerializeField] private SoTargetableRuntimeSet _activeEntities;
[SerializeField] private Targetable _targeterParent;
[SerializeField] private Targetable _targetEntity;
public void SetParent(EntityBase newParent) => _targeterParent = newParent;
public void SetParent(Transform newParent) => _targeterParent.transform.parent = newParent;
public void SetConfig(STargeterConfig config)
public void SetConfig(SoTargeterConfig config)
{
_range = config._range;
_targetStrategy = config._selectedTargetStrategy;
_activeEntities = config._activeEntities;
}
public EntityBase GetTarget()
public Targetable GetTarget()
{
return _targetEntity;
}
@ -29,7 +31,7 @@ namespace AsteroidGame.Entities
float currentBestValue = Mathf.Infinity;
var targetFound = false;
foreach (EntityBase targetEntity in _activeEntities._list)
foreach (var targetEntity in _activeEntities._list)
{
float distanceToTarget =
Vector3.Magnitude(targetEntity.GetCenterPosition() - _targeterParent.GetCenterPosition());
@ -39,7 +41,7 @@ namespace AsteroidGame.Entities
{
switch (_targetStrategy)
{
case STargeterConfig.TargetStrategy.LowestRange:
case SoTargeterConfig.TargetStrategy.LowestRange:
{
bool isClosest = distanceToTarget < currentBestValue;
if (isClosest)
@ -51,9 +53,10 @@ namespace AsteroidGame.Entities
break;
}
case STargeterConfig.TargetStrategy.LowestHealth:
case SoTargeterConfig.TargetStrategy.LowestHealth:
{
float enemyHealth = targetEntity.GetHealth();
float enemyHealth = targetEntity.transform.parent.GetComponent<Damageable>()
.GetCurrentHealth();
bool isLowestHealth = enemyHealth < currentBestValue;
if (isLowestHealth)

View File

@ -1,3 +1,4 @@
using AsteroidGame.ScriptableObjects;
using UnityEngine;
using UnityEngine.Serialization;
@ -6,7 +7,7 @@ namespace AsteroidGame.Entities
public class Disabler : MonoBehaviour
{
[FormerlySerializedAs("Set")]
[SerializeField] private SStructureBaseRuntimeSet _set;
[SerializeField] private SoStructureBaseRuntimeSet _set;
[ContextMenu("Disable All")]
public void DisableAll()

View File

@ -1,5 +1,5 @@
using System;
using AsteroidGame.Interfaces;
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.Entities
@ -12,11 +12,11 @@ namespace AsteroidGame.Entities
[SerializeField] protected float _buildTimer;
[Header("Configuration")]
[SerializeField] private SEntityBaseRuntimeSet _structureBaseSet;
[SerializeField] private SPowerBaseRuntimeSet _powerBaseSet;
[SerializeField] private SoEntityBaseRuntimeSet _structureBaseSet;
[SerializeField] private SoPowerBaseRuntimeSet _powerBaseSet;
[Header("Power")]
[SerializeField] private SPowerConfig _powerConfig;
[SerializeField] private SoPowerConfig _powerConfig;
[SerializeField] private PowerBase _power;
#region Publics

View File

@ -1,5 +1,5 @@
using System;
using AsteroidGame.Entities.Enemies.Scripts;
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;
namespace AsteroidGame.Entities
@ -20,9 +20,9 @@ namespace AsteroidGame.Entities
[SerializeField] private Transform _barrel;
[Header("Targeter")]
[SerializeField] private STargeterConfig _targeterConfig;
[SerializeField] private SoTargeterConfig _targeterConfig;
[SerializeField] private Targeter _targeter;
[SerializeField] private EntityBase _target;
[SerializeField] private Targetable _target;
#region Publics
@ -43,17 +43,16 @@ namespace AsteroidGame.Entities
private void InitializeTargeter()
{
_targeter = gameObject.AddComponent<Targeter>();
_targeter.SetParent(this);
//_targeter.SetParent(this);
_targeter.SetConfig(_targeterConfig);
}
private void Update()
{
if (_targeter.FoundTarget())
{
_target = _targeter.GetTarget();
_turretHead.transform.LookAt(_target.GetCenterPosition());
}
if (!_targeter.FoundTarget()) return;
_target = _targeter.GetTarget();
_turretHead.transform.LookAt(_target.GetCenterPosition());
}
}
}

View File

@ -1,4 +1,5 @@
using AsteroidGame.Entities;
using AsteroidGame.ScriptableObjects;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.Serialization;
@ -16,11 +17,13 @@ namespace AsteroidGame.Handlers
[SerializeField] private bool _isBuilding;
[SerializeField] private int _buildingSelector;
[FormerlySerializedAs("_availableSStructures")]
[FormerlySerializedAs("_availableStructures")]
[Header("Structures")]
[SerializeField] private SStructureBaseList _availableSStructures;
[SerializeField] private SoStructureBaseList _availableSoStructures;
#region Private
private Color _colorCurrent;
private Camera _camera;
private Vector3 _tempVec;
@ -34,14 +37,9 @@ namespace AsteroidGame.Handlers
protected override void OnEnable()
{
base.OnEnable();
// for (int i = 0; i < _availableStructuresObject._structureList.Count; i++)
// {
// _availableStructures.Add(i, _availableStructuresObject._structureList[i]);
// }
_camera = Camera.main;
_buildPlane = new Plane(Vector3.up, Vector3.zero);
//_activeStructures.Clear();
}
private void Update()
@ -107,7 +105,8 @@ namespace AsteroidGame.Handlers
private void SpawnGhostStructure()
{
_ghostStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), Quaternion.identity,
_ghostStructure = Instantiate(_availableSoStructures._structureList[_buildingSelector], GetPlanePoint(),
Quaternion.identity,
transform);
_ghostStructure.name = "GhostStructure";
@ -131,10 +130,9 @@ namespace AsteroidGame.Handlers
private void SpawnStructure()
{
_tempStructure = Instantiate(_availableSStructures._structureList[_buildingSelector], GetPlanePoint(), Quaternion.identity,
_tempStructure = Instantiate(_availableSoStructures._structureList[_buildingSelector], GetPlanePoint(),
Quaternion.identity,
transform);
// _activeStructures.Add(_tempStructure);
// _buildingLists[0].Add(_tempStructure);
}
#region Getters
@ -151,16 +149,6 @@ namespace AsteroidGame.Handlers
return Vector3.zero;
}
// public List<StructureBase> GetAvailableStructures()
// {
// return _availableStructures._structureList;
// }
// public List<StructureBase> GetActiveStructures()
// {
// return _activeStructures;
// }
#endregion
#region Setters

View File

@ -1,4 +1,4 @@
using AsteroidGame.Entities;
using AsteroidGame.ScriptableObjects;
using UnityEngine;
namespace AsteroidGame.Handlers
@ -10,9 +10,9 @@ namespace AsteroidGame.Handlers
[SerializeField] private int _objectPoolSize = 15;
[Header("Configuration")]
[SerializeField] private SEnemyBaseList _availableEnemies;
[SerializeField] private SoEnemyBaseList _availableEnemies;
[Header("Lists")]
[SerializeField] private SEntityBaseRuntimeSet _activeEnemies;
[SerializeField] private SoEntityBaseRuntimeSet _activeEnemies;
}
}

View File

@ -1,5 +1,5 @@
using System;
using AsteroidGame.Entities;
using AsteroidGame.ScriptableObjects;
using UnityEngine;
namespace AsteroidGame.Handlers
@ -13,7 +13,8 @@ namespace AsteroidGame.Handlers
[SerializeField] private float _powerFactor;
[Header("Connections")]
[SerializeField] private SPowerBaseRuntimeSet _activePowerStructures;
[SerializeField] private SoPowerBaseRuntimeSet _activePowerStructures;
private void Update()
{
@ -43,7 +44,7 @@ namespace AsteroidGame.Handlers
_powerFactor = 0;
}
}
public int GetMaxPower()
{
throw new NotImplementedException();

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.3.0
// version 1.7.0
// from Assets/InputSystem/CameraControllActions.inputactions
//
// Changes to this file may cause incorrect behavior and will be lost if
@ -15,15 +15,12 @@ using System.Collections.Generic;
using UnityEngine.InputSystem;
using UnityEngine.InputSystem.Utilities;
namespace InputSystem
public partial class @CameraControllActions: IInputActionCollection2, IDisposable
{
public partial class @CameraControllActions : IInputActionCollection2, IDisposable
public InputActionAsset asset { get; }
public @CameraControllActions()
{
public InputActionAsset asset { get; }
public @CameraControllActions()
{
asset = InputActionAsset.FromJson(@"{
asset = InputActionAsset.FromJson(@"{
""name"": ""CameraControllActions"",
""maps"": [
{
@ -141,149 +138,134 @@ namespace InputSystem
],
""controlSchemes"": []
}");
// Camera
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
m_Camera_Movement = m_Camera.FindAction("Movement", throwIfNotFound: true);
m_Camera_RotateCamera = m_Camera.FindAction("RotateCamera", throwIfNotFound: true);
m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true);
}
public void Dispose()
{
UnityEngine.Object.Destroy(asset);
}
public InputBinding? bindingMask
{
get => asset.bindingMask;
set => asset.bindingMask = value;
}
public ReadOnlyArray<InputDevice>? devices
{
get => asset.devices;
set => asset.devices = value;
}
public ReadOnlyArray<InputControlScheme> controlSchemes => asset.controlSchemes;
public bool Contains(InputAction action)
{
return asset.Contains(action);
}
public IEnumerator<InputAction> GetEnumerator()
{
return asset.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
public void Enable()
{
asset.Enable();
}
public void Disable()
{
asset.Disable();
}
public IEnumerable<InputBinding> 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);
}
// Camera
private readonly InputActionMap m_Camera;
private ICameraActions m_CameraActionsCallbackInterface;
private readonly InputAction m_Camera_Movement;
private readonly InputAction m_Camera_RotateCamera;
private readonly InputAction m_Camera_ZoomCamera;
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
m_Camera_Movement = m_Camera.FindAction("Movement", throwIfNotFound: true);
m_Camera_RotateCamera = m_Camera.FindAction("RotateCamera", throwIfNotFound: true);
m_Camera_ZoomCamera = m_Camera.FindAction("ZoomCamera", throwIfNotFound: true);
}
public struct CameraActions
public void Dispose()
{
UnityEngine.Object.Destroy(asset);
}
public InputBinding? bindingMask
{
get => asset.bindingMask;
set => asset.bindingMask = value;
}
public ReadOnlyArray<InputDevice>? devices
{
get => asset.devices;
set => asset.devices = value;
}
public ReadOnlyArray<InputControlScheme> controlSchemes => asset.controlSchemes;
public bool Contains(InputAction action)
{
return asset.Contains(action);
}
public IEnumerator<InputAction> GetEnumerator()
{
return asset.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
public void Enable()
{
asset.Enable();
}
public void Disable()
{
asset.Disable();
}
public IEnumerable<InputBinding> 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);
}
// Camera
private readonly InputActionMap m_Camera;
private List<ICameraActions> m_CameraActionsCallbackInterfaces = new List<ICameraActions>();
private readonly InputAction m_Camera_Movement;
private readonly InputAction m_Camera_RotateCamera;
private readonly InputAction m_Camera_ZoomCamera;
public struct CameraActions
{
private @CameraControllActions m_Wrapper;
public CameraActions(@CameraControllActions wrapper) { m_Wrapper = wrapper; }
public InputAction @Movement => m_Wrapper.m_Camera_Movement;
public InputAction @RotateCamera => m_Wrapper.m_Camera_RotateCamera;
public InputAction @ZoomCamera => m_Wrapper.m_Camera_ZoomCamera;
public InputActionMap Get() { return m_Wrapper.m_Camera; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(CameraActions set) { return set.Get(); }
public void AddCallbacks(ICameraActions instance)
{
private @CameraControllActions m_Wrapper;
public CameraActions(@CameraControllActions wrapper)
{
m_Wrapper = wrapper;
}
public InputAction @Movement => m_Wrapper.m_Camera_Movement;
public InputAction @RotateCamera => m_Wrapper.m_Camera_RotateCamera;
public InputAction @ZoomCamera => m_Wrapper.m_Camera_ZoomCamera;
public InputActionMap Get()
{
return m_Wrapper.m_Camera;
}
public void Enable()
{
Get().Enable();
}
public void Disable()
{
Get().Disable();
}
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(CameraActions set)
{
return set.Get();
}
public void SetCallbacks(ICameraActions instance)
{
if (m_Wrapper.m_CameraActionsCallbackInterface != null)
{
@Movement.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement;
@Movement.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement;
@Movement.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnMovement;
@RotateCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera;
@RotateCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera;
@RotateCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnRotateCamera;
@ZoomCamera.started -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera;
@ZoomCamera.performed -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera;
@ZoomCamera.canceled -= m_Wrapper.m_CameraActionsCallbackInterface.OnZoomCamera;
}
m_Wrapper.m_CameraActionsCallbackInterface = instance;
if (instance != null)
{
@Movement.started += instance.OnMovement;
@Movement.performed += instance.OnMovement;
@Movement.canceled += instance.OnMovement;
@RotateCamera.started += instance.OnRotateCamera;
@RotateCamera.performed += instance.OnRotateCamera;
@RotateCamera.canceled += instance.OnRotateCamera;
@ZoomCamera.started += instance.OnZoomCamera;
@ZoomCamera.performed += instance.OnZoomCamera;
@ZoomCamera.canceled += instance.OnZoomCamera;
}
}
if (instance == null || m_Wrapper.m_CameraActionsCallbackInterfaces.Contains(instance)) return;
m_Wrapper.m_CameraActionsCallbackInterfaces.Add(instance);
@Movement.started += instance.OnMovement;
@Movement.performed += instance.OnMovement;
@Movement.canceled += instance.OnMovement;
@RotateCamera.started += instance.OnRotateCamera;
@RotateCamera.performed += instance.OnRotateCamera;
@RotateCamera.canceled += instance.OnRotateCamera;
@ZoomCamera.started += instance.OnZoomCamera;
@ZoomCamera.performed += instance.OnZoomCamera;
@ZoomCamera.canceled += instance.OnZoomCamera;
}
public CameraActions @Camera => new CameraActions(this);
public interface ICameraActions
private void UnregisterCallbacks(ICameraActions instance)
{
void OnMovement(InputAction.CallbackContext context);
void OnRotateCamera(InputAction.CallbackContext context);
void OnZoomCamera(InputAction.CallbackContext context);
@Movement.started -= instance.OnMovement;
@Movement.performed -= instance.OnMovement;
@Movement.canceled -= instance.OnMovement;
@RotateCamera.started -= instance.OnRotateCamera;
@RotateCamera.performed -= instance.OnRotateCamera;
@RotateCamera.canceled -= instance.OnRotateCamera;
@ZoomCamera.started -= instance.OnZoomCamera;
@ZoomCamera.performed -= instance.OnZoomCamera;
@ZoomCamera.canceled -= instance.OnZoomCamera;
}
public void RemoveCallbacks(ICameraActions instance)
{
if (m_Wrapper.m_CameraActionsCallbackInterfaces.Remove(instance))
UnregisterCallbacks(instance);
}
public void SetCallbacks(ICameraActions instance)
{
foreach (var item in m_Wrapper.m_CameraActionsCallbackInterfaces)
UnregisterCallbacks(item);
m_Wrapper.m_CameraActionsCallbackInterfaces.Clear();
AddCallbacks(instance);
}
}
}
public CameraActions @Camera => new CameraActions(this);
public interface ICameraActions
{
void OnMovement(InputAction.CallbackContext context);
void OnRotateCamera(InputAction.CallbackContext context);
void OnZoomCamera(InputAction.CallbackContext context);
}
}

View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
// version 1.3.0
// version 1.7.0
// from Assets/InputSystem/HandlerControls.inputactions
//
// Changes to this file may cause incorrect behavior and will be lost if
@ -17,7 +17,7 @@ using UnityEngine.InputSystem.Utilities;
namespace AsteroidGame
{
public partial class @HandlerControls : IInputActionCollection2, IDisposable
public partial class @HandlerControls: IInputActionCollection2, IDisposable
{
public InputActionAsset asset { get; }
public @HandlerControls()
@ -964,12 +964,14 @@ namespace AsteroidGame
{
asset.Disable();
}
public IEnumerable<InputBinding> 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);
@ -977,7 +979,7 @@ namespace AsteroidGame
// Player
private readonly InputActionMap m_Player;
private IPlayerActions m_PlayerActionsCallbackInterface;
private List<IPlayerActions> m_PlayerActionsCallbackInterfaces = new List<IPlayerActions>();
private readonly InputAction m_Player_Move;
private readonly InputAction m_Player_Look;
private readonly InputAction m_Player_LeftClick;
@ -997,52 +999,65 @@ namespace AsteroidGame
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(PlayerActions set) { return set.Get(); }
public void AddCallbacks(IPlayerActions instance)
{
if (instance == null || m_Wrapper.m_PlayerActionsCallbackInterfaces.Contains(instance)) return;
m_Wrapper.m_PlayerActionsCallbackInterfaces.Add(instance);
@Move.started += instance.OnMove;
@Move.performed += instance.OnMove;
@Move.canceled += instance.OnMove;
@Look.started += instance.OnLook;
@Look.performed += instance.OnLook;
@Look.canceled += instance.OnLook;
@LeftClick.started += instance.OnLeftClick;
@LeftClick.performed += instance.OnLeftClick;
@LeftClick.canceled += instance.OnLeftClick;
@Build.started += instance.OnBuild;
@Build.performed += instance.OnBuild;
@Build.canceled += instance.OnBuild;
@RightClick.started += instance.OnRightClick;
@RightClick.performed += instance.OnRightClick;
@RightClick.canceled += instance.OnRightClick;
}
private void UnregisterCallbacks(IPlayerActions instance)
{
@Move.started -= instance.OnMove;
@Move.performed -= instance.OnMove;
@Move.canceled -= instance.OnMove;
@Look.started -= instance.OnLook;
@Look.performed -= instance.OnLook;
@Look.canceled -= instance.OnLook;
@LeftClick.started -= instance.OnLeftClick;
@LeftClick.performed -= instance.OnLeftClick;
@LeftClick.canceled -= instance.OnLeftClick;
@Build.started -= instance.OnBuild;
@Build.performed -= instance.OnBuild;
@Build.canceled -= instance.OnBuild;
@RightClick.started -= instance.OnRightClick;
@RightClick.performed -= instance.OnRightClick;
@RightClick.canceled -= instance.OnRightClick;
}
public void RemoveCallbacks(IPlayerActions instance)
{
if (m_Wrapper.m_PlayerActionsCallbackInterfaces.Remove(instance))
UnregisterCallbacks(instance);
}
public void SetCallbacks(IPlayerActions instance)
{
if (m_Wrapper.m_PlayerActionsCallbackInterface != null)
{
@Move.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMove;
@Move.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMove;
@Move.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnMove;
@Look.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLook;
@Look.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLook;
@Look.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLook;
@LeftClick.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLeftClick;
@LeftClick.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLeftClick;
@LeftClick.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnLeftClick;
@Build.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnBuild;
@Build.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnBuild;
@Build.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnBuild;
@RightClick.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRightClick;
@RightClick.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRightClick;
@RightClick.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnRightClick;
}
m_Wrapper.m_PlayerActionsCallbackInterface = instance;
if (instance != null)
{
@Move.started += instance.OnMove;
@Move.performed += instance.OnMove;
@Move.canceled += instance.OnMove;
@Look.started += instance.OnLook;
@Look.performed += instance.OnLook;
@Look.canceled += instance.OnLook;
@LeftClick.started += instance.OnLeftClick;
@LeftClick.performed += instance.OnLeftClick;
@LeftClick.canceled += instance.OnLeftClick;
@Build.started += instance.OnBuild;
@Build.performed += instance.OnBuild;
@Build.canceled += instance.OnBuild;
@RightClick.started += instance.OnRightClick;
@RightClick.performed += instance.OnRightClick;
@RightClick.canceled += instance.OnRightClick;
}
foreach (var item in m_Wrapper.m_PlayerActionsCallbackInterfaces)
UnregisterCallbacks(item);
m_Wrapper.m_PlayerActionsCallbackInterfaces.Clear();
AddCallbacks(instance);
}
}
public PlayerActions @Player => new PlayerActions(this);
// UI
private readonly InputActionMap m_UI;
private IUIActions m_UIActionsCallbackInterface;
private List<IUIActions> m_UIActionsCallbackInterfaces = new List<IUIActions>();
private readonly InputAction m_UI_Navigate;
private readonly InputAction m_UI_Submit;
private readonly InputAction m_UI_Cancel;
@ -1072,75 +1087,88 @@ namespace AsteroidGame
public void Disable() { Get().Disable(); }
public bool enabled => Get().enabled;
public static implicit operator InputActionMap(UIActions set) { return set.Get(); }
public void AddCallbacks(IUIActions instance)
{
if (instance == null || m_Wrapper.m_UIActionsCallbackInterfaces.Contains(instance)) return;
m_Wrapper.m_UIActionsCallbackInterfaces.Add(instance);
@Navigate.started += instance.OnNavigate;
@Navigate.performed += instance.OnNavigate;
@Navigate.canceled += instance.OnNavigate;
@Submit.started += instance.OnSubmit;
@Submit.performed += instance.OnSubmit;
@Submit.canceled += instance.OnSubmit;
@Cancel.started += instance.OnCancel;
@Cancel.performed += instance.OnCancel;
@Cancel.canceled += instance.OnCancel;
@Point.started += instance.OnPoint;
@Point.performed += instance.OnPoint;
@Point.canceled += instance.OnPoint;
@Click.started += instance.OnClick;
@Click.performed += instance.OnClick;
@Click.canceled += instance.OnClick;
@ScrollWheel.started += instance.OnScrollWheel;
@ScrollWheel.performed += instance.OnScrollWheel;
@ScrollWheel.canceled += instance.OnScrollWheel;
@MiddleClick.started += instance.OnMiddleClick;
@MiddleClick.performed += instance.OnMiddleClick;
@MiddleClick.canceled += instance.OnMiddleClick;
@RightClick.started += instance.OnRightClick;
@RightClick.performed += instance.OnRightClick;
@RightClick.canceled += instance.OnRightClick;
@TrackedDevicePosition.started += instance.OnTrackedDevicePosition;
@TrackedDevicePosition.performed += instance.OnTrackedDevicePosition;
@TrackedDevicePosition.canceled += instance.OnTrackedDevicePosition;
@TrackedDeviceOrientation.started += instance.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.performed += instance.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.canceled += instance.OnTrackedDeviceOrientation;
}
private void UnregisterCallbacks(IUIActions instance)
{
@Navigate.started -= instance.OnNavigate;
@Navigate.performed -= instance.OnNavigate;
@Navigate.canceled -= instance.OnNavigate;
@Submit.started -= instance.OnSubmit;
@Submit.performed -= instance.OnSubmit;
@Submit.canceled -= instance.OnSubmit;
@Cancel.started -= instance.OnCancel;
@Cancel.performed -= instance.OnCancel;
@Cancel.canceled -= instance.OnCancel;
@Point.started -= instance.OnPoint;
@Point.performed -= instance.OnPoint;
@Point.canceled -= instance.OnPoint;
@Click.started -= instance.OnClick;
@Click.performed -= instance.OnClick;
@Click.canceled -= instance.OnClick;
@ScrollWheel.started -= instance.OnScrollWheel;
@ScrollWheel.performed -= instance.OnScrollWheel;
@ScrollWheel.canceled -= instance.OnScrollWheel;
@MiddleClick.started -= instance.OnMiddleClick;
@MiddleClick.performed -= instance.OnMiddleClick;
@MiddleClick.canceled -= instance.OnMiddleClick;
@RightClick.started -= instance.OnRightClick;
@RightClick.performed -= instance.OnRightClick;
@RightClick.canceled -= instance.OnRightClick;
@TrackedDevicePosition.started -= instance.OnTrackedDevicePosition;
@TrackedDevicePosition.performed -= instance.OnTrackedDevicePosition;
@TrackedDevicePosition.canceled -= instance.OnTrackedDevicePosition;
@TrackedDeviceOrientation.started -= instance.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.performed -= instance.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.canceled -= instance.OnTrackedDeviceOrientation;
}
public void RemoveCallbacks(IUIActions instance)
{
if (m_Wrapper.m_UIActionsCallbackInterfaces.Remove(instance))
UnregisterCallbacks(instance);
}
public void SetCallbacks(IUIActions instance)
{
if (m_Wrapper.m_UIActionsCallbackInterface != null)
{
@Navigate.started -= m_Wrapper.m_UIActionsCallbackInterface.OnNavigate;
@Navigate.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnNavigate;
@Navigate.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnNavigate;
@Submit.started -= m_Wrapper.m_UIActionsCallbackInterface.OnSubmit;
@Submit.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnSubmit;
@Submit.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnSubmit;
@Cancel.started -= m_Wrapper.m_UIActionsCallbackInterface.OnCancel;
@Cancel.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnCancel;
@Cancel.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnCancel;
@Point.started -= m_Wrapper.m_UIActionsCallbackInterface.OnPoint;
@Point.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnPoint;
@Point.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnPoint;
@Click.started -= m_Wrapper.m_UIActionsCallbackInterface.OnClick;
@Click.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnClick;
@Click.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnClick;
@ScrollWheel.started -= m_Wrapper.m_UIActionsCallbackInterface.OnScrollWheel;
@ScrollWheel.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnScrollWheel;
@ScrollWheel.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnScrollWheel;
@MiddleClick.started -= m_Wrapper.m_UIActionsCallbackInterface.OnMiddleClick;
@MiddleClick.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnMiddleClick;
@MiddleClick.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnMiddleClick;
@RightClick.started -= m_Wrapper.m_UIActionsCallbackInterface.OnRightClick;
@RightClick.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnRightClick;
@RightClick.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnRightClick;
@TrackedDevicePosition.started -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDevicePosition;
@TrackedDevicePosition.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDevicePosition;
@TrackedDevicePosition.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDevicePosition;
@TrackedDeviceOrientation.started -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.performed -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.canceled -= m_Wrapper.m_UIActionsCallbackInterface.OnTrackedDeviceOrientation;
}
m_Wrapper.m_UIActionsCallbackInterface = instance;
if (instance != null)
{
@Navigate.started += instance.OnNavigate;
@Navigate.performed += instance.OnNavigate;
@Navigate.canceled += instance.OnNavigate;
@Submit.started += instance.OnSubmit;
@Submit.performed += instance.OnSubmit;
@Submit.canceled += instance.OnSubmit;
@Cancel.started += instance.OnCancel;
@Cancel.performed += instance.OnCancel;
@Cancel.canceled += instance.OnCancel;
@Point.started += instance.OnPoint;
@Point.performed += instance.OnPoint;
@Point.canceled += instance.OnPoint;
@Click.started += instance.OnClick;
@Click.performed += instance.OnClick;
@Click.canceled += instance.OnClick;
@ScrollWheel.started += instance.OnScrollWheel;
@ScrollWheel.performed += instance.OnScrollWheel;
@ScrollWheel.canceled += instance.OnScrollWheel;
@MiddleClick.started += instance.OnMiddleClick;
@MiddleClick.performed += instance.OnMiddleClick;
@MiddleClick.canceled += instance.OnMiddleClick;
@RightClick.started += instance.OnRightClick;
@RightClick.performed += instance.OnRightClick;
@RightClick.canceled += instance.OnRightClick;
@TrackedDevicePosition.started += instance.OnTrackedDevicePosition;
@TrackedDevicePosition.performed += instance.OnTrackedDevicePosition;
@TrackedDevicePosition.canceled += instance.OnTrackedDevicePosition;
@TrackedDeviceOrientation.started += instance.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.performed += instance.OnTrackedDeviceOrientation;
@TrackedDeviceOrientation.canceled += instance.OnTrackedDeviceOrientation;
}
foreach (var item in m_Wrapper.m_UIActionsCallbackInterfaces)
UnregisterCallbacks(item);
m_Wrapper.m_UIActionsCallbackInterfaces.Clear();
AddCallbacks(instance);
}
}
public UIActions @UI => new UIActions(this);

View File

@ -1,8 +0,0 @@
namespace AsteroidGame.Interfaces
{
public interface IBuildable
{
public int GetCost();
public int SetCost(int newCost);
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 99361805272d7f6419384097857e2bd6
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,31 +0,0 @@
namespace AsteroidGame.Interfaces
{
public interface IDamageable
{
public void ModifyHealth(int healthChange);
#region PublicProperties
public bool IsInvulnerable { get; }
#endregion
#region Setters
public void SetHealth(int newHealth);
public void SetMaxHealth(int newHealth);
public void SetInvulnerable (bool newState);
#endregion
#region Getters
public int GetHealth();
public int GetMaxHealth();
public float GetHealthFactor();
#endregion
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: d0290b6d2e8462547a0d40b67a1076e3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,17 +0,0 @@
namespace AsteroidGame.Interfaces
{
public interface IPowerSystem
{
public bool IsGenerator { get; }
public bool IsConsumer { get; }
public void SetMaxPower(int newValue);
public int GetMaxPower();
public int GetCurrentPower();
public float GetPowerFactor();
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: c3e9b410a74a04f4ab85e908d2a684a8
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,11 +0,0 @@
using UnityEngine;
namespace AsteroidGame.Interfaces
{
public interface ITargetable
{
public Vector3 GetCenterPosition();
public Vector3 GetBasePosition();
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 3d338501124dcf349b3852a83d20dbe4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
namespace AsteroidGame.Interfaces
{
public interface IWeapon
{
public float FireRate { get; set; }
public float Damage { get; set; }
}
}

View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: a4d06a75a5a64c83aa191a8610f5080f
timeCreated: 1664621279

View File

@ -1,14 +0,0 @@
{
"name": "Interfaces",
"rootNamespace": "AsteroidGame",
"references": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
@ -25,6 +25,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: ColliderIndicator
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
@ -43,6 +45,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -122,6 +125,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -151,6 +158,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -201,6 +210,8 @@ Material:
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
@ -223,9 +234,9 @@ Material:
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 1
@ -233,6 +244,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0

View File

@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: GhostMaterial
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
@ -27,6 +29,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -106,6 +109,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -135,6 +142,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -185,6 +194,8 @@ Material:
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
@ -207,9 +218,9 @@ Material:
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 1
@ -217,6 +228,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0
@ -263,7 +275,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
@ -25,6 +25,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Opaque_Blue
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _NORMALMAP_TANGENT_SPACE
@ -40,6 +42,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -119,6 +122,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -148,6 +155,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -198,6 +207,8 @@ Material:
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
@ -220,9 +231,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -230,6 +241,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0

View File

@ -9,6 +9,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Opaque_Gray
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _NORMALMAP_TANGENT_SPACE
@ -24,6 +26,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -135,6 +138,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -164,6 +171,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -220,6 +229,8 @@ Material:
- _Mode: 0
- _NormalMapSpace: 0
- _NormalScale: 1.24
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OcclusionStrength: 1
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
@ -246,9 +257,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -256,6 +267,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0
@ -303,7 +315,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
@ -25,6 +25,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Opaque_Red
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _NORMALMAP_TANGENT_SPACE
@ -40,6 +42,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -119,6 +122,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -148,6 +155,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 0
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -198,6 +207,8 @@ Material:
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
@ -220,9 +231,9 @@ Material:
- _StencilRefGBuffer: 10
- _StencilRefMV: 40
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 0
@ -230,6 +241,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0

View File

@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: da692e001514ec24dbc4cca1949ff7e8, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 12
version: 13
hdPluginSubTargetMaterialVersions:
m_Keys: []
m_Values:
@ -25,6 +25,8 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: Transparent_Green
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _DISABLE_SSR_TRANSPARENT
- _ENABLE_FOG_ON_TRANSPARENT
@ -43,6 +45,7 @@ Material:
- TransparentBackface
- RayTracingPrepass
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@ -122,6 +125,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmissionMaskMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TransmittanceColorMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -151,6 +158,8 @@ Material:
- _AlphaCutoffPrepass: 0.5
- _AlphaCutoffShadow: 0.5
- _AlphaDstBlend: 10
- _AlphaRemapMax: 1
- _AlphaRemapMin: 0
- _AlphaSrcBlend: 1
- _AlphaToMask: 0
- _AlphaToMaskInspectorValue: 0
@ -201,6 +210,8 @@ Material:
- _MetallicRemapMin: 0
- _NormalMapSpace: 0
- _NormalScale: 1
- _ObjectSpaceUVMapping: 0
- _ObjectSpaceUVMappingEmissive: 0
- _OpaqueCullMode: 2
- _PPDLodThreshold: 5
- _PPDMaxSamples: 15
@ -223,9 +234,9 @@ Material:
- _StencilRefGBuffer: 2
- _StencilRefMV: 32
- _StencilWriteMask: 6
- _StencilWriteMaskDepth: 8
- _StencilWriteMaskGBuffer: 14
- _StencilWriteMaskMV: 40
- _StencilWriteMaskDepth: 9
- _StencilWriteMaskGBuffer: 15
- _StencilWriteMaskMV: 41
- _SubsurfaceMask: 1
- _SupportDecals: 1
- _SurfaceType: 1
@ -233,6 +244,7 @@ Material:
- _TexWorldScaleEmissive: 1
- _Thickness: 1
- _TransmissionEnable: 1
- _TransmissionMask: 1
- _TransparentBackfaceEnable: 0
- _TransparentCullMode: 2
- _TransparentDepthPostpassEnable: 0

View File

@ -46,6 +46,24 @@ MonoBehaviour:
m_SampleCount:
m_OverrideState: 1
m_Value: 8
--- !u!114 &-1793858814174886103
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7a7ff42a8c5be6646ad3975f3a54c1eb, type: 3}
m_Name: DiffusionProfileList
m_EditorClassIdentifier:
active: 1
diffusionProfiles:
m_OverrideState: 1
m_Value:
- {fileID: 11400000, guid: eceab268f6a04e749af041e5e365872a, type: 2}
- {fileID: 11400000, guid: 3370ac1ab02538142af9851e66038745, type: 2}
--- !u!114 &-1016694868962581565
MonoBehaviour:
m_ObjectHideFlags: 3
@ -117,6 +135,7 @@ MonoBehaviour:
- {fileID: 1932259527246508038}
- {fileID: 448115243408767295}
- {fileID: -7089757308646879465}
- {fileID: -1793858814174886103}
--- !u!114 &448115243408767295
MonoBehaviour:
m_ObjectHideFlags: 3
@ -143,10 +162,10 @@ MonoBehaviour:
m_OverrideState: 0
m_Value: 1
upperHemisphereLuxValue:
m_OverrideState: 0
m_OverrideState: 1
m_Value: 0.4660715
upperHemisphereLuxColor:
m_OverrideState: 0
m_OverrideState: 1
m_Value: {x: 0.18750614, y: 0.29181972, z: 0.5}
desiredLuxValue:
m_OverrideState: 0
@ -511,6 +530,9 @@ MonoBehaviour:
m_Value:
serializedVersion: 2
m_Bits: 4294967295
specularOcclusion:
m_OverrideState: 0
m_Value: 0.5
occluderMotionRejection:
m_OverrideState: 0
m_Value: 1
@ -560,6 +582,9 @@ MonoBehaviour:
mode:
m_OverrideState: 1
m_Value: 2
useFullACES:
m_OverrideState: 0
m_Value: 0
toeStrength:
m_OverrideState: 0
m_Value: 0
@ -584,6 +609,33 @@ MonoBehaviour:
lutContribution:
m_OverrideState: 0
m_Value: 1
neutralHDRRangeReductionMode:
m_OverrideState: 0
m_Value: 2
acesPreset:
m_OverrideState: 0
m_Value: 3
fallbackMode:
m_OverrideState: 0
m_Value: 1
hueShiftAmount:
m_OverrideState: 0
m_Value: 0
detectPaperWhite:
m_OverrideState: 0
m_Value: 0
paperWhite:
m_OverrideState: 0
m_Value: 300
detectBrightnessLimits:
m_OverrideState: 0
m_Value: 1
minNits:
m_OverrideState: 0
m_Value: 0.005
maxNits:
m_OverrideState: 0
m_Value: 1000
--- !u!114 &7686318427622180703
MonoBehaviour:
m_ObjectHideFlags: 3

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4b8bc87700fc5a44b88c1b13c4bdb3cf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,20 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
namespace AsteroidGame.ScriptableObjects
{
public abstract class SRuntimeSet<T> : ScriptableObject
{
public List<T> _list;
public void Add(T component)
{
_list.Add(component);
}
public void Remove(T component)
{
_list.Remove(component);
}
}
}

View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 1e81b384c7f010b4fa3c1b8f293a4c42
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,14 +0,0 @@
{
"name": "ScriptableObjects",
"rootNamespace": "AsteroidGame",
"references": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: eb3099ff524d60545a136315a154d67b
AssemblyDefinitionImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,4 +1,3 @@
using InputSystem;
using UnityEngine;
using UnityEngine.InputSystem;

View File

@ -3,15 +3,17 @@ using AsteroidGame.Entities;
using UnityEngine;
using UnityEngine.UIElements;
using AsteroidGame.Handlers;
using AsteroidGame.ScriptableObjects;
using UnityEngine.Serialization;
namespace AsteroidGame.UI
{
public class BuildMenuUiController : MonoBehaviour
{
[FormerlySerializedAs("_availableSStructuresObject")]
[FormerlySerializedAs("_availableStructuresObject")]
[Header("Structures")]
[SerializeField] private SStructureBaseList _availableSStructuresObject;
[SerializeField] private SoStructureBaseList _availableSoStructuresObject;
private VisualElement _mRoot;
private VisualElement _mSlotContainer;
@ -20,7 +22,7 @@ namespace AsteroidGame.UI
private void OnEnable()
{
_buildings = _availableSStructuresObject._structureList;
_buildings = _availableSoStructuresObject._structureList;
_buildingHandler = FindObjectOfType<BuildingHandler>();
//Store the root from the UI Document component

View File

@ -1,19 +1,18 @@
{
"dependencies": {
"com.unity.collab-proxy": "1.17.2",
"com.unity.ai.navigation": "1.1.5",
"com.unity.feature.development": "1.0.1",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.25",
"com.unity.ide.visualstudio": "2.0.21",
"com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.4.2",
"com.unity.render-pipelines.high-definition": "12.1.7",
"com.unity.test-framework": "1.1.31",
"com.unity.inputsystem": "1.7.0",
"com.unity.render-pipelines.high-definition": "14.0.8",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.6.4",
"com.unity.timeline": "1.7.5",
"com.unity.ugui": "1.0.0",
"com.unity.ui": "2.0.0",
"com.unity.ui.builder": "2.0.0",
"com.unity.visualscripting": "1.7.8",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",

View File

@ -1,7 +1,16 @@
{
"dependencies": {
"com.unity.ai.navigation": {
"version": "1.1.5",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.ai": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.6.6",
"version": "1.8.8",
"depth": 1,
"source": "registry",
"dependencies": {
@ -9,15 +18,6 @@
},
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "1.17.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.services.core": "1.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.editorcoroutines": {
"version": "1.0.0",
"depth": 1,
@ -37,17 +37,17 @@
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.ide.visualstudio": "2.0.16",
"com.unity.ide.rider": "3.0.15",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
"com.unity.test-framework": "1.1.31",
"com.unity.testtools.codecoverage": "1.0.1"
"com.unity.performance.profile-analyzer": "1.2.2",
"com.unity.test-framework": "1.1.33",
"com.unity.testtools.codecoverage": "1.2.4"
}
},
"com.unity.ide.rider": {
"version": "3.0.15",
"version": "3.0.25",
"depth": 0,
"source": "registry",
"dependencies": {
@ -56,7 +56,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.16",
"version": "2.0.21",
"depth": 0,
"source": "registry",
"dependencies": {
@ -72,7 +72,7 @@
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.4.2",
"version": "1.7.0",
"depth": 0,
"source": "registry",
"dependencies": {
@ -87,91 +87,74 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "3.0.2",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.performance.profile-analyzer": {
"version": "1.1.1",
"version": "1.2.2",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "12.1.7",
"version": "14.0.8",
"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.render-pipelines.high-definition": {
"version": "12.1.7",
"version": "14.0.8",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.4",
"com.unity.burst": "1.6.0",
"com.unity.burst": "1.8.4",
"com.unity.modules.video": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.render-pipelines.core": "12.1.7",
"com.unity.shadergraph": "12.1.7",
"com.unity.visualeffectgraph": "12.1.7",
"com.unity.render-pipelines.high-definition-config": "12.1.7"
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.shadergraph": "14.0.8",
"com.unity.visualeffectgraph": "14.0.8",
"com.unity.render-pipelines.high-definition-config": "14.0.8"
}
},
"com.unity.render-pipelines.high-definition-config": {
"version": "12.1.7",
"version": "14.0.8",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "12.1.7"
"com.unity.render-pipelines.core": "14.0.8"
}
},
"com.unity.searcher": {
"version": "4.9.1",
"version": "4.9.2",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.4.2",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.modules.androidjni": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.settings-manager": {
"version": "1.0.3",
"version": "2.0.1",
"depth": 2,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "12.1.7",
"version": "14.0.8",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "12.1.7",
"com.unity.searcher": "4.9.1"
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.searcher": "4.9.2"
}
},
"com.unity.test-framework": {
"version": "1.1.31",
"version": "1.1.33",
"depth": 0,
"source": "registry",
"dependencies": {
@ -182,7 +165,7 @@
"url": "https://packages.unity.com"
},
"com.unity.testtools.codecoverage": {
"version": "1.0.1",
"version": "1.2.4",
"depth": 1,
"source": "registry",
"dependencies": {
@ -201,7 +184,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.6.4",
"version": "1.7.5",
"depth": 0,
"source": "registry",
"dependencies": {
@ -234,24 +217,14 @@
"dependencies": {}
},
"com.unity.visualeffectgraph": {
"version": "12.1.7",
"version": "14.0.8",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.shadergraph": "12.1.7",
"com.unity.render-pipelines.core": "12.1.7"
"com.unity.shadergraph": "14.0.8",
"com.unity.render-pipelines.core": "14.0.8"
}
},
"com.unity.visualscripting": {
"version": "1.7.8",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,
@ -384,17 +357,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",

View File

@ -0,0 +1,18 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"DebugDataKind": 1,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

View File

@ -0,0 +1,6 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}

View File

@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_ProjectSettingFolderPath: HDRPDefaultResources
m_WizardPopupAtStart: 0
m_LastMaterialVersion: 12
m_LastMaterialVersion: 13
m_HDShaderGraphLastSeenVersion: 0
m_PluginMaterialVersions:
m_Keys: []

View File

@ -1,6 +1,4 @@
{
"m_Name": "Settings",
"m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json",
"m_Dictionary": {
"m_DictionaryValues": []
}

View File

@ -3,7 +3,7 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 23
serializedVersion: 26
productGUID: d003377464fe2f043a1d84fa3cee25a6
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
@ -48,14 +48,15 @@ PlayerSettings:
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
m_ActiveColorSpace: 1
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
@ -85,6 +86,7 @@ PlayerSettings:
hideHomeButton: 0
submitAnalytics: 1
usePlayerLog: 1
dedicatedServerOptimizations: 0
bakeCollisionMeshes: 0
forceSingleInstance: 0
useFlipModelSwapchain: 1
@ -119,8 +121,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
@ -128,12 +134,7 @@ PlayerSettings:
vulkanEnablePreTransform: 1
vulkanEnableLateAcquireNextImage: 0
vulkanEnableCommandBufferRecycling: 1
m_SupportedAspectRatios:
4:3: 1
5:4: 1
16:10: 1
16:9: 1
Others: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.1
preloadedAssets: []
metroInputSource: 0
@ -147,7 +148,7 @@ PlayerSettings:
enableFrameTimingStats: 0
enableOpenGLProfilerGPURecorders: 1
useHDRDisplay: 0
D3DHDRBitDepth: 0
hdrBitDepth: 0
m_ColorGamuts: 00000000
targetPixelDensity: 30
resolutionScalingMode: 0
@ -157,6 +158,7 @@ PlayerSettings:
applicationIdentifier: {}
buildNumber:
Standalone: 0
VisionOS: 0
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
@ -174,12 +176,15 @@ PlayerSettings:
APKExpansionFiles: 0
keepLoadedShadersAlive: 0
StripUnusedMeshComponents: 1
strictShaderVariantMatching: 0
VertexChannelCompressionMask: 4054
iPhoneSdkVersion: 988
iOSTargetOSVersionString: 11.0
iOSTargetOSVersionString: 12.0
tvOSSdkVersion: 0
tvOSRequireExtendedGameController: 0
tvOSTargetOSVersionString: 11.0
tvOSTargetOSVersionString: 12.0
VisionOSSdkVersion: 0
VisionOSTargetOSVersionString: 1.0
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1
@ -227,8 +232,10 @@ PlayerSettings:
appleDeveloperTeamID:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:
VisionOSManualSigningProvisioningProfileID:
iOSManualSigningProvisioningProfileType: 0
tvOSManualSigningProvisioningProfileType: 0
VisionOSManualSigningProvisioningProfileType: 0
appleEnableAutomaticSigning: 0
iOSRequireARKit: 0
iOSAutomaticallyDetectAndAddCapabilities: 1
@ -243,6 +250,7 @@ PlayerSettings:
useCustomLauncherGradleManifest: 0
useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 0
useCustomGradleSettingsTemplate: 0
useCustomProguardFile: 0
AndroidTargetArchitectures: 1
AndroidTargetDevices: 0
@ -250,6 +258,7 @@ PlayerSettings:
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidEnableArmv9SecurityFeatures: 0
AndroidBuildApkPerCpuArchitecture: 0
AndroidTVCompatibility: 0
AndroidIsGame: 1
@ -263,7 +272,6 @@ PlayerSettings:
banner: {fileID: 0}
androidGamepadSupportLevel: 0
chromeosInputEmulation: 1
AndroidMinifyWithR8: 0
AndroidMinifyRelease: 0
AndroidMinifyDebug: 0
AndroidValidateAppBundleSize: 1
@ -286,6 +294,7 @@ PlayerSettings:
- m_BuildTarget: WebGL
m_StaticBatching: 0
m_DynamicBatching: 0
m_BuildTargetShaderSettings: []
m_BuildTargetGraphicsJobs:
- m_BuildTarget: MacStandaloneSupport
m_GraphicsJobs: 0
@ -337,6 +346,8 @@ PlayerSettings:
m_Devices:
- Oculus
- OpenVR
m_DefaultShaderChunkSizeInMB: 16
m_DefaultShaderChunkCount: 0
openGLRequireES31: 0
openGLRequireES31AEP: 0
openGLRequireES32: 0
@ -358,7 +369,21 @@ PlayerSettings:
m_EncodingQuality: 2
- m_BuildTarget: Windows Store Apps
m_EncodingQuality: 2
m_BuildTargetGroupHDRCubemapEncodingQuality:
- m_BuildTarget: Android
m_EncodingQuality: 2
- m_BuildTarget: iPhone
m_EncodingQuality: 1
- m_BuildTarget: tvOS
m_EncodingQuality: 1
- m_BuildTarget: Standalone
m_EncodingQuality: 2
- m_BuildTarget: Lumin
m_EncodingQuality: 1
- m_BuildTarget: Windows Store Apps
m_EncodingQuality: 2
m_BuildTargetGroupLightmapSettings: []
m_BuildTargetGroupLoadStoreDebugModeSettings: []
m_BuildTargetNormalMapEncoding:
- m_BuildTarget: Android
m_Encoding: 1
@ -379,6 +404,7 @@ PlayerSettings:
locationUsageDescription:
microphoneUsageDescription:
bluetoothUsageDescription:
macOSTargetOSVersion: 10.13.0
switchNMETAOverride:
switchNetLibKey:
switchSocketMemoryPoolSize: 6144
@ -386,10 +412,12 @@ PlayerSettings:
switchSocketConcurrencyLimit: 14
switchScreenResolutionBehavior: 2
switchUseCPUProfiler: 0
switchEnableFileSystemTrace: 0
switchUseGOLDLinker: 0
switchLTOSetting: 0
switchApplicationID: 0x01004b9000490000
switchNSODependencies:
switchCompilerFlags:
switchTitleNames_0:
switchTitleNames_1:
switchTitleNames_2:
@ -463,7 +491,6 @@ PlayerSettings:
switchReleaseVersion: 0
switchDisplayVersion: 1.0.0
switchStartupUserAccount: 0
switchTouchScreenUsage: 0
switchSupportedLanguagesMask: 0
switchLogoType: 0
switchApplicationErrorCodeCategory:
@ -505,6 +532,7 @@ PlayerSettings:
switchNativeFsCacheSize: 32
switchIsHoldTypeHorizontal: 0
switchSupportedNpadCount: 8
switchEnableTouchScreen: 1
switchSocketConfigEnabled: 0
switchTcpInitialSendBufferSize: 32
switchTcpInitialReceiveBufferSize: 64
@ -517,6 +545,7 @@ PlayerSettings:
switchNetworkInterfaceManagerInitializeEnabled: 1
switchPlayerConnectionEnabled: 1
switchUseNewStyleFilepaths: 0
switchUseLegacyFmodPriorities: 0
switchUseMicroSleepForYield: 1
switchEnableRamDiskSupport: 0
switchMicroSleepForYieldTime: 25
@ -604,6 +633,7 @@ PlayerSettings:
webGLMemorySize: 16
webGLExceptionSupport: 1
webGLNameFilesAsHashes: 0
webGLShowDiagnostics: 0
webGLDataCaching: 1
webGLDebugSymbols: 0
webGLEmscriptenArgs:
@ -616,21 +646,41 @@ PlayerSettings:
webGLLinkerTarget: 1
webGLThreadsSupport: 0
webGLDecompressionFallback: 0
webGLInitialMemorySize: 32
webGLMaximumMemorySize: 2048
webGLMemoryGrowthMode: 2
webGLMemoryLinearGrowthStep: 16
webGLMemoryGeometricGrowthStep: 0.2
webGLMemoryGeometricGrowthCap: 96
webGLPowerPreference: 2
scriptingDefineSymbols: {}
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: {}
il2cppCompilerConfiguration: {}
managedStrippingLevel: {}
il2cppCodeGeneration: {}
managedStrippingLevel:
EmbeddedLinux: 1
GameCoreScarlett: 1
GameCoreXboxOne: 1
Nintendo Switch: 1
PS4: 1
PS5: 1
QNX: 1
Stadia: 1
VisionOS: 1
WebGL: 1
Windows Store Apps: 1
XboxOne: 1
iPhone: 1
tvOS: 1
incrementalIl2cppBuild: {}
suppressCommonWarnings: 1
allowUnsafeCode: 0
useDeterministicCompilation: 1
enableRoslynAnalyzers: 1
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 1
assemblyVersionValidation: 1
gcWBarrierValidation: 0
apiCompatibilityLevelPerPlatform: {}
m_RenderingPath: 1
@ -703,8 +753,14 @@ PlayerSettings:
luminVersion:
m_VersionCode: 1
m_VersionName:
hmiPlayerDataPath:
hmiForceSRGBBlit: 1
embeddedLinuxEnableGamepadInput: 1
hmiLogStartupTiming: 0
hmiCpuConfiguration:
apiCompatibilityLevel: 6
activeInputHandler: 1
windowsGamepadBackendHint: 0
cloudProjectId:
framebufferDepthMemorylessMode: 0
qualitySettingsNames: []
@ -712,6 +768,7 @@ PlayerSettings:
organizationId:
cloudEnabled: 0
legacyClampBlendShapeWeights: 0
playerDataPath:
forceSRGBBlit: 1
hmiLoadingImage: {fileID: 0}
platformRequiresReadableAssets: 0
virtualTexturingSupportEnabled: 0
insecureHttpOption: 0

View File

@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.11f1
m_EditorVersionWithRevision: 2021.3.11f1 (0a5ca18544bf)
m_EditorVersion: 2022.3.10f1
m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)

View File

@ -6,7 +6,7 @@ QualitySettings:
serializedVersion: 5
m_CurrentQuality: 5
m_QualitySettings:
- serializedVersion: 2
- serializedVersion: 3
name: Very Low
pixelLightCount: 0
shadows: 0
@ -19,16 +19,20 @@ QualitySettings:
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
skinWeights: 1
textureQuality: 1
globalTextureMipmapLimit: 1
textureMipmapLimitSettings: []
anisotropicTextures: 0
antiAliasing: 0
softParticles: 0
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
useLegacyDetailDistribution: 1
vSyncCount: 0
realtimeGICPUUsage: 25
lodBias: 0.3
maximumLODLevel: 0
enableLODCrossFade: 1
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
@ -41,8 +45,17 @@ QualitySettings:
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
terrainQualityOverrides: 0
terrainPixelError: 1
terrainDetailDensityScale: 1
terrainBasemapDistance: 1000
terrainDetailDistance: 80
terrainTreeDistance: 5000
terrainBillboardStart: 50
terrainFadeLength: 5
terrainMaxTrees: 50
excludedTargetPlatforms: []
- serializedVersion: 2
- serializedVersion: 3
name: Low
pixelLightCount: 0
shadows: 0
@ -55,16 +68,20 @@ QualitySettings:
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
skinWeights: 2
textureQuality: 0
globalTextureMipmapLimit: 0
textureMipmapLimitSettings: []
anisotropicTextures: 0
antiAliasing: 0
softParticles: 0
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
useLegacyDetailDistribution: 1
vSyncCount: 0
realtimeGICPUUsage: 25
lodBias: 0.4
maximumLODLevel: 0
enableLODCrossFade: 1
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
@ -77,8 +94,17 @@ QualitySettings:
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
terrainQualityOverrides: 0
terrainPixelError: 1
terrainDetailDensityScale: 1
terrainBasemapDistance: 1000
terrainDetailDistance: 80
terrainTreeDistance: 5000
terrainBillboardStart: 50
terrainFadeLength: 5
terrainMaxTrees: 50
excludedTargetPlatforms: []
- serializedVersion: 2
- serializedVersion: 3
name: Medium
pixelLightCount: 1
shadows: 1
@ -91,16 +117,20 @@ QualitySettings:
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
skinWeights: 2
textureQuality: 0
globalTextureMipmapLimit: 0
textureMipmapLimitSettings: []
anisotropicTextures: 1
antiAliasing: 0
softParticles: 0
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
useLegacyDetailDistribution: 1
vSyncCount: 1
realtimeGICPUUsage: 25
lodBias: 0.7
maximumLODLevel: 0
enableLODCrossFade: 1
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
@ -113,8 +143,17 @@ QualitySettings:
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
terrainQualityOverrides: 0
terrainPixelError: 1
terrainDetailDensityScale: 1
terrainBasemapDistance: 1000
terrainDetailDistance: 80
terrainTreeDistance: 5000
terrainBillboardStart: 50
terrainFadeLength: 5
terrainMaxTrees: 50
excludedTargetPlatforms: []
- serializedVersion: 2
- serializedVersion: 3
name: High
pixelLightCount: 2
shadows: 2
@ -127,16 +166,20 @@ QualitySettings:
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
skinWeights: 2
textureQuality: 0
globalTextureMipmapLimit: 0
textureMipmapLimitSettings: []
anisotropicTextures: 1
antiAliasing: 0
softParticles: 0
softVegetation: 1
realtimeReflectionProbes: 1
billboardsFaceCameraPosition: 1
useLegacyDetailDistribution: 1
vSyncCount: 1
realtimeGICPUUsage: 50
lodBias: 1
maximumLODLevel: 0
enableLODCrossFade: 1
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
@ -149,8 +192,17 @@ QualitySettings:
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
terrainQualityOverrides: 0
terrainPixelError: 1
terrainDetailDensityScale: 1
terrainBasemapDistance: 1000
terrainDetailDistance: 80
terrainTreeDistance: 5000
terrainBillboardStart: 50
terrainFadeLength: 5
terrainMaxTrees: 50
excludedTargetPlatforms: []
- serializedVersion: 2
- serializedVersion: 3
name: Very High
pixelLightCount: 3
shadows: 2
@ -163,16 +215,20 @@ QualitySettings:
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
skinWeights: 4
textureQuality: 0
globalTextureMipmapLimit: 0
textureMipmapLimitSettings: []
anisotropicTextures: 2
antiAliasing: 2
softParticles: 1
softVegetation: 1
realtimeReflectionProbes: 1
billboardsFaceCameraPosition: 1
useLegacyDetailDistribution: 1
vSyncCount: 1
realtimeGICPUUsage: 50
lodBias: 1.5
maximumLODLevel: 0
enableLODCrossFade: 1
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
@ -185,8 +241,17 @@ QualitySettings:
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
terrainQualityOverrides: 0
terrainPixelError: 1
terrainDetailDensityScale: 1
terrainBasemapDistance: 1000
terrainDetailDistance: 80
terrainTreeDistance: 5000
terrainBillboardStart: 50
terrainFadeLength: 5
terrainMaxTrees: 50
excludedTargetPlatforms: []
- serializedVersion: 2
- serializedVersion: 3
name: Ultra
pixelLightCount: 4
shadows: 2
@ -199,16 +264,20 @@ QualitySettings:
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
skinWeights: 4
textureQuality: 0
globalTextureMipmapLimit: 0
textureMipmapLimitSettings: []
anisotropicTextures: 2
antiAliasing: 2
softParticles: 1
softVegetation: 1
realtimeReflectionProbes: 1
billboardsFaceCameraPosition: 1
useLegacyDetailDistribution: 1
vSyncCount: 1
realtimeGICPUUsage: 100
lodBias: 1
maximumLODLevel: 0
enableLODCrossFade: 1
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
@ -221,7 +290,17 @@ QualitySettings:
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
terrainQualityOverrides: 0
terrainPixelError: 1
terrainDetailDensityScale: 1
terrainBasemapDistance: 1000
terrainDetailDistance: 80
terrainTreeDistance: 5000
terrainBillboardStart: 50
terrainFadeLength: 5
terrainMaxTrees: 50
excludedTargetPlatforms: []
m_TextureMipmapLimitGroupNames: []
m_PerPlatformDefaultQuality:
Android: 2
Lumin: 5

View File

@ -10,6 +10,8 @@ VFXManager:
m_RenderPipeSettingsPath:
m_FixedTimeStep: 0.016666668
m_MaxDeltaTime: 0.05
m_CompiledVersion: 4
m_RuntimeVersion: 22
m_MaxScrubTime: 30
m_CompiledVersion: 7
m_RuntimeVersion: 35
m_RuntimeResources: {fileID: 11400000, guid: bc10b42afe3813544bffd38ae2cd893d, type: 2}
m_BatchEmptyLifetime: 300