diff --git a/Assets/Prefabs/Buildings/Castle.prefab b/Assets/Prefabs/Buildings/Castle.prefab index f0d6b5f..ecffe6a 100644 --- a/Assets/Prefabs/Buildings/Castle.prefab +++ b/Assets/Prefabs/Buildings/Castle.prefab @@ -269,8 +269,8 @@ GameObject: m_Component: - component: {fileID: 4738724134341998529} - component: {fileID: 3129090374542533064} - - component: {fileID: 3389094527817988571} - m_Layer: 0 + - component: {fileID: 7107627688917009505} + m_Layer: 3 m_Name: Detection m_TagString: Untagged m_Icon: {fileID: 0} @@ -305,7 +305,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _entityLinked: {fileID: 498655111277194201} ---- !u!61 &3389094527817988571 +--- !u!61 &7107627688917009505 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -321,10 +321,10 @@ BoxCollider2D: 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: 1, y: 1} - newSize: {x: 11.65, y: 5.55} - adaptiveTilingThreshold: 0.5 + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 @@ -341,6 +341,7 @@ GameObject: m_Component: - component: {fileID: 8169559242600365314} - component: {fileID: 3828680565076245792} + - component: {fileID: 1718320054306818987} m_Layer: 0 m_Name: root m_TagString: Untagged @@ -380,6 +381,17 @@ MonoBehaviour: _entity: {fileID: 498655111277194201} _projectile: {fileID: 6962989255644195630, guid: 8c97d676f9e78de408a30be69193ca5e, type: 3} _projectileSpawn: {fileID: 7055490709728624221} +--- !u!210 &1718320054306818987 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7593581371702012092} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 --- !u!1 &7803635882566565305 GameObject: m_ObjectHideFlags: 0 @@ -481,7 +493,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7939484193916151742 Transform: m_ObjectHideFlags: 0 @@ -587,10 +599,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4760673158665372231, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8104010403964510583, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8131035023550608747, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_Name value: HPSlider objectReference: {fileID: 0} + - target: {fileID: 8131035023550608747, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} --- !u!114 &981581452810264329 stripped diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 48fa146..cf10fa3 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -2682,10 +2682,10 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 + m_BlockingObjects: 1 m_BlockingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 119 --- !u!114 &1092900230 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Ally/AllyUpgrade.cs b/Assets/Scripts/Ally/AllyUpgrade.cs index dfdd8b9..82616bf 100644 --- a/Assets/Scripts/Ally/AllyUpgrade.cs +++ b/Assets/Scripts/Ally/AllyUpgrade.cs @@ -36,7 +36,6 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler { Destroy(_instance); } - } } diff --git a/Assets/Scripts/Ally/Castle.cs b/Assets/Scripts/Ally/Castle.cs index 20094ec..d3207e4 100644 --- a/Assets/Scripts/Ally/Castle.cs +++ b/Assets/Scripts/Ally/Castle.cs @@ -44,7 +44,8 @@ public class Castle : Building for(int i = 0; i < 4 && IsEnemyDetected; i++) { Invoke("ShootInterval", 0.1f * i); - if(Enemy.Hp <= 0) IsEnemyDetected = false; + + if (Enemy.Hp <= 0) IsEnemyDetected = false; } AttackSpeedWait = 0f; diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index abc216a..73d5eb4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - objWithCollider - Water - UI - InvisibleToCamera