Fix a bug with the end condition (9e1b295b) · Commits · Adam Štěpánek / Tearian

Assets/Prefabs/Spaceship.prefab

+17 −15

Original line number	Diff line number	Diff line
		@@ -12,9 +12,9 @@ GameObject:
		- component: {fileID: 3756859516283072282}
		- component: {fileID: 3756859516283072283}
		- component: {fileID: 3756859516283072285}
		- component: {fileID: 3756859516283072281}
		- component: {fileID: 3756859516283072284}
		- component: {fileID: 3756859516283072286}
		- component: {fileID: 911316379538385357}
		m_Layer: 8
		m_Name: Spaceship
		m_TagString: Untagged
		@@ -74,6 +74,7 @@ MonoBehaviour:
		height: 10
		Speed: 0.666
		StartHealth: 100
		UpgradeKeeper: {fileID: 0}
		--- !u!135 &3756859516283072285
		SphereCollider:
		m_ObjectHideFlags: 0
		@@ -87,20 +88,6 @@ SphereCollider:
		serializedVersion: 2
		m_Radius: 1
		m_Center: {x: 0, y: 0, z: 0}
		--- !u!114 &3756859516283072281
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3756859516283072263}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: 99a58730276379740af6fd4fdf4c50ea, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		DmgFromEnemy: 10
		DmgFromOther: 5
		--- !u!114 &3756859516283072284
		MonoBehaviour:
		m_ObjectHideFlags: 0
		@@ -116,6 +103,7 @@ MonoBehaviour:
		Period: 0.2
		ShotLayer: 8
		ShotSpeed: 10
		ShotDamage: 50
		Shot: {fileID: 5498966872552307195, guid: a01425121aa91db41a1312fdbe89601e, type: 3}
		--- !u!95 &3756859516283072286
		Animator:
		@@ -136,6 +124,20 @@ Animator:
		m_HasTransformHierarchy: 1
		m_AllowConstantClipSamplingOptimization: 1
		m_KeepAnimatorControllerStateOnDisable: 0
		--- !u!114 &911316379538385357
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3756859516283072263}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: 599cf8c30f2883b47be42f858b2d3286, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		OpponentLayer: 9
		DefaultDamage: 50
		--- !u!1001 &3756859516728042218
		PrefabInstance:
		m_ObjectHideFlags: 0

Assets/Scenes/EarlGrey.unity

+1 −20

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ LightmapSettings:
		m_TrainingDataDestination: TrainingData
		m_LightProbeSampleCountMultiplier: 4
		m_LightingDataAsset: {fileID: 0}
		m_UseShadowmask: 1
		m_UseShadowmask: 0
		--- !u!196 &4
		NavMeshSettings:
		serializedVersion: 2
		@@ -197,20 +197,6 @@ GameObject:
		type: 3}
		m_PrefabInstance: {fileID: 3756859516575154184}
		m_PrefabAsset: {fileID: 0}
		--- !u!114 &396046096
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 396046095}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: 599cf8c30f2883b47be42f858b2d3286, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		OpponentLayer: 9
		DefaultDamage: 50
		--- !u!114 &481037646 stripped
		MonoBehaviour:
		m_CorrespondingSourceObject: {fileID: 3109095386323130575, guid: 1ca971bd5ace9184da8fe676e059f1b9,
		@@ -768,11 +754,6 @@ PrefabInstance:
		propertyPath: UpgradeKeeper
		value:
		objectReference: {fileID: 481037646}
		- target: {fileID: 3756859516283072284, guid: 73fc10572e863034d92c7165d6f7a4bd,
		type: 3}
		propertyPath: ShotDamage
		value: 50
		objectReference: {fileID: 0}
		m_RemovedComponents:
		- {fileID: 3756859516283072281, guid: 73fc10572e863034d92c7165d6f7a4bd, type: 3}
		m_SourcePrefab: {fileID: 100100000, guid: 73fc10572e863034d92c7165d6f7a4bd, type: 3}

Assets/Scenes/Matcha.unity

+0 −29

Original line number	Diff line number	Diff line
		@@ -488,20 +488,6 @@ GameObject:
		type: 3}
		m_PrefabInstance: {fileID: 1351529093}
		m_PrefabAsset: {fileID: 0}
		--- !u!114 &653692435
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 653692434}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: 599cf8c30f2883b47be42f858b2d3286, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		OpponentLayer: 9
		DefaultDamage: 50
		--- !u!1001 &1351529093
		PrefabInstance:
		m_ObjectHideFlags: 0
		@@ -579,21 +565,6 @@ PrefabInstance:
		propertyPath: UpgradeKeeper
		value:
		objectReference: {fileID: 1927515}
		- target: {fileID: 3756859516283072284, guid: 73fc10572e863034d92c7165d6f7a4bd,
		type: 3}
		propertyPath: m_Enabled
		value: 0
		objectReference: {fileID: 0}
		- target: {fileID: 3756859516283072284, guid: 73fc10572e863034d92c7165d6f7a4bd,
		type: 3}
		propertyPath: ShotDamage
		value: 50
		objectReference: {fileID: 0}
		- target: {fileID: 3756859516283072284, guid: 73fc10572e863034d92c7165d6f7a4bd,
		type: 3}
		propertyPath: ShotSpeed
		value: 10
		objectReference: {fileID: 0}
		m_RemovedComponents:
		- {fileID: 3756859516283072281, guid: 73fc10572e863034d92c7165d6f7a4bd, type: 3}
		m_SourcePrefab: {fileID: 100100000, guid: 73fc10572e863034d92c7165d6f7a4bd, type: 3}

Assets/Scripts/EndCondition.cs

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ public class EndCondition : MonoBehaviour

		public void Start()
		{
		IsGameOver = false;
		player = Player.GetComponent<IKillable>();
		}