diff --git a/games/unity/magisterka_1/Assets/Bullet.cs b/games/unity/magisterka_1/Assets/Bullet.cs index f226dcc..3c197a3 100644 --- a/games/unity/magisterka_1/Assets/Bullet.cs +++ b/games/unity/magisterka_1/Assets/Bullet.cs @@ -11,11 +11,13 @@ public class Bullet : MonoBehaviour } void OnTriggerEnter2D(Collider2D other) -{ - if (other.CompareTag("Enemy")) { - Destroy(other.gameObject); - Destroy(gameObject); - } -} + Debug.Log($"Bullet hit: {other.name} with tag: {other.tag}"); + if (other.gameObject.GetComponent() != null) + { + Debug.Log("Enemy destroyed!"); + Destroy(other.gameObject); + Destroy(gameObject); + } + } } diff --git a/games/unity/magisterka_1/Assets/Enemy.cs b/games/unity/magisterka_1/Assets/Enemy.cs index c1d53ef..c8095fa 100644 --- a/games/unity/magisterka_1/Assets/Enemy.cs +++ b/games/unity/magisterka_1/Assets/Enemy.cs @@ -11,10 +11,11 @@ public class Enemy : MonoBehaviour } void OnTriggerEnter2D(Collider2D other) -{ - if (other.CompareTag("Player")) { - Destroy(other.gameObject); + Debug.Log($"Enemy hit: {other.name} with tag: {other.tag}"); + if (other.gameObject.GetComponent() != null) + { + Destroy(other.gameObject); + } } -} } \ No newline at end of file diff --git a/games/unity/magisterka_1/Assets/Enemy.prefab b/games/unity/magisterka_1/Assets/Enemy.prefab index 542fd95..54d615f 100644 --- a/games/unity/magisterka_1/Assets/Enemy.prefab +++ b/games/unity/magisterka_1/Assets/Enemy.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 2263850070361640900} - component: {fileID: 498029782833750543} - component: {fileID: 3170550521239760013} + - component: {fileID: 6342353457756561597} + - component: {fileID: 8071515206519997710} m_Layer: 0 m_Name: Enemy m_TagString: Enemy @@ -101,3 +103,76 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 2 +--- !u!50 &6342353457756561597 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 54115470021400029} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &8071515206519997710 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 54115470021400029} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.82, y: 0.84} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.82, y: 0.84} + m_EdgeRadius: 0 diff --git a/games/unity/magisterka_1/Assets/Scenes/SampleScene.unity b/games/unity/magisterka_1/Assets/Scenes/SampleScene.unity index 131adb3..47b73cf 100644 --- a/games/unity/magisterka_1/Assets/Scenes/SampleScene.unity +++ b/games/unity/magisterka_1/Assets/Scenes/SampleScene.unity @@ -119,6 +119,63 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &18726133 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1418154143990535457, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_Name + value: bullet + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.12858006 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalPosition.y + value: -1.7754705 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6793468876798102636, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 860dbf3604c77dbc8832a9171bbf036f, type: 3} --- !u!1 &144850750 GameObject: m_ObjectHideFlags: 0 @@ -472,6 +529,63 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1108153903 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 54115470021400029, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_Name + value: Enemy + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalPosition.x + value: -0.04786808 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalPosition.y + value: 2.2874794 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2263850070361640900, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4abd498abb0b5742b88a4b3742840fa, type: 3} --- !u!1 &1539097747 GameObject: m_ObjectHideFlags: 0 @@ -568,3 +682,5 @@ SceneRoots: - {fileID: 619394802} - {fileID: 144850752} - {fileID: 3486274023181712303} + - {fileID: 1108153903} + - {fileID: 18726133} diff --git a/games/unity/magisterka_1/Assets/Settings/UniversalRP.asset b/games/unity/magisterka_1/Assets/Settings/UniversalRP.asset index fccfdda..e88db67 100644 --- a/games/unity/magisterka_1/Assets/Settings/UniversalRP.asset +++ b/games/unity/magisterka_1/Assets/Settings/UniversalRP.asset @@ -78,6 +78,7 @@ MonoBehaviour: m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_AllowPostProcessAlphaOutput: 0 m_UseFastSRGBLinearConversion: 0 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 @@ -98,34 +99,35 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 + m_PrefilteringModeMainLightShadows: 4 m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeAdditionalLightShadows: 0 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/games/unity/magisterka_1/Assets/UniversalRenderPipelineGlobalSettings.asset b/games/unity/magisterka_1/Assets/UniversalRenderPipelineGlobalSettings.asset index 460b756..bf0ba60 100644 --- a/games/unity/magisterka_1/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/games/unity/magisterka_1/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -60,7 +60,17 @@ MonoBehaviour: - rid: 123599451562180610 - rid: 123599451562180611 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 7752762179098771456 + - rid: 7752762179098771457 + - rid: 7752762179098771459 + - rid: 7752762179098771461 + - rid: 7752762179098771462 + - rid: 7752762179098771464 + - rid: 7752762179098771466 + - rid: 7752762179098771468 + - rid: 7752762179098771472 + - rid: 7752762179098771476 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: diff --git a/games/unity/magisterka_1/Assets/bullet.prefab b/games/unity/magisterka_1/Assets/bullet.prefab index 5e5fcde..ace9c2f 100644 --- a/games/unity/magisterka_1/Assets/bullet.prefab +++ b/games/unity/magisterka_1/Assets/bullet.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 6605588499548926263} - component: {fileID: 7457823564284724897} - component: {fileID: -5548322051545787044} + - component: {fileID: -2339392186648181908} + - component: {fileID: -3848706103947547950} m_Layer: 0 m_Name: bullet m_TagString: Untagged @@ -116,3 +118,77 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4312f1821f7bbb61eb20f44d70445516, type: 3} m_Name: m_EditorClassIdentifier: + speed: 10 +--- !u!50 &-2339392186648181908 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418154143990535457} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &-3848706103947547950 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418154143990535457} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.13, y: 0.37} + newSize: {x: 1, y: 2} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 0.13, y: 0.37} + m_EdgeRadius: 0