Implement actual functionality of upgrades (cb48d5ca) · Commits · Adam Štěpánek / Tearian

Assets/Animations/Spaceship.controller

+26 −2

Original line number	Diff line number	Diff line
		%YAML 1.1
		%TAG !u! tag:unity3d.com,2011:
		--- !u!114 &-6985665722005923166
		MonoBehaviour:
		m_ObjectHideFlags: 1
		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: 891e1601a851a7144a0f99e534320b8a, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		--- !u!114 &-4888875544084359178
		MonoBehaviour:
		m_ObjectHideFlags: 1
		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: 30de1543fa3dbbc4ba15f742a4e3c640, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		--- !u!91 &9100000
		AnimatorController:
		m_ObjectHideFlags: 0
		@@ -34,8 +58,8 @@ AnimatorState:
		m_CycleOffset: 0
		m_Transitions: []
		m_StateMachineBehaviours:
		- {fileID: 2324885425674615692}
		- {fileID: 6198826488323187450}
		- {fileID: -4888875544084359178}
		- {fileID: -6985665722005923166}
		m_Position: {x: 50, y: 50, z: 0}
		m_IKOnFeet: 0
		m_WriteDefaultValues: 1

Assets/Data/ShotSpeedUpgrade.asset→Assets/Data/ShotEffectivenessUpgrade.asset

+3 −2

Original line number	Diff line number	Diff line
		@@ -10,13 +10,14 @@ MonoBehaviour:
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: a1f26756d58d38344ac5d754e2297ecb, type: 3}
		m_Name: ShotSpeedUpgrade
		m_Name: ShotEffectivenessUpgrade
		m_EditorClassIdentifier:
		Name: Extra Theine
		Key: IncreaseShotSpeed
		Key: IncreaseShotEffectiveness
		Description: The tea is slighty more effective
		GunPeriodFactor: 1
		ShotSpeedFactor: 1.1
		ShotDamageFactor: 1.1
		ShipSpeedFactor: 1
		ShipHealthFactor: 1
		Cost: 10

Assets/Data/ShotSpeedUpgrade.asset.meta→Assets/Data/ShotEffectivenessUpgrade.asset.meta

+0 −0

File moved.

View file

Assets/Prefabs/Enemy.prefab

+19 −15

Original line number	Diff line number	Diff line
		@@ -12,9 +12,9 @@ GameObject:
		- component: {fileID: 6493153375528438029}
		- component: {fileID: 467878737505383393}
		- component: {fileID: 3150628556986992836}
		- component: {fileID: 5953756465631702530}
		- component: {fileID: 6350973580162270572}
		- component: {fileID: 4126692984388648405}
		- component: {fileID: 88010453286023309}
		m_Layer: 9
		m_Name: Enemy
		m_TagString: Untagged
		@@ -53,6 +53,8 @@ MonoBehaviour:
		m_EditorClassIdentifier:
		Player: {fileID: 0}
		StartHealth: 100
		Speed: 3
		ScoreKeeper: {fileID: 0}
		--- !u!54 &467878737505383393
		Rigidbody:
		m_ObjectHideFlags: 0
		@@ -82,20 +84,6 @@ SphereCollider:
		serializedVersion: 2
		m_Radius: 1
		m_Center: {x: 0, y: 0, z: 0}
		--- !u!114 &5953756465631702530
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 173417370436742304}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: f452861abbd26ae4aa4e2c1c21964928, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		DmgFromPlayer: 100
		DmgFromOther: 50
		--- !u!114 &6350973580162270572
		MonoBehaviour:
		m_ObjectHideFlags: 0
		@@ -129,7 +117,23 @@ MonoBehaviour:
		Period: 1
		ShotLayer: 9
		ShotSpeed: 10
		ShotDamage: 10
		Shot: {fileID: 5498966872552307195, guid: a01425121aa91db41a1312fdbe89601e, type: 3}
		--- !u!114 &88010453286023309
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 173417370436742304}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: 599cf8c30f2883b47be42f858b2d3286, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		EnemyLayer: 8
		DmgFromEnemy: 100
		DmgFromOther: 100
		--- !u!1001 &734496402725695141
		PrefabInstance:
		m_ObjectHideFlags: 0

Assets/Prefabs/PrefsGod.prefab

0 → 100644

+65 −0

Original line number	Diff line number	Diff line
		%YAML 1.1
		%TAG !u! tag:unity3d.com,2011:
		--- !u!1 &3109095386323130572
		GameObject:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		serializedVersion: 6
		m_Component:
		- component: {fileID: 3109095386323130574}
		- component: {fileID: 3109095386323130573}
		- component: {fileID: 3109095386323130575}
		m_Layer: 0
		m_Name: PrefsGod
		m_TagString: Untagged
		m_Icon: {fileID: 0}
		m_NavMeshLayer: 0
		m_StaticEditorFlags: 0
		m_IsActive: 1
		--- !u!4 &3109095386323130574
		Transform:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3109095386323130572}
		m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
		m_LocalPosition: {x: 0.056255672, y: 0.24542488, z: -4.286093}
		m_LocalScale: {x: 1, y: 1, z: 1}
		m_Children: []
		m_Father: {fileID: 0}
		m_RootOrder: 0
		m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
		--- !u!114 &3109095386323130573
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3109095386323130572}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: e3f8ced0725dfa54f9ddeab21a5513c4, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		Text: {fileID: 0}
		Padding: 9
		--- !u!114 &3109095386323130575
		MonoBehaviour:
		m_ObjectHideFlags: 0
		m_CorrespondingSourceObject: {fileID: 0}
		m_PrefabInstance: {fileID: 0}
		m_PrefabAsset: {fileID: 0}
		m_GameObject: {fileID: 3109095386323130572}
		m_Enabled: 1
		m_EditorHideFlags: 0
		m_Script: {fileID: 11500000, guid: 2b1f7ecdc6643d34f920fe67770e6105, type: 3}
		m_Name:
		m_EditorClassIdentifier:
		Assortment:
		- {fileID: 11400000, guid: a9055ba61c6953a4ea4ca27b29165409, type: 2}
		- {fileID: 11400000, guid: a1a2d43b2a39b6c49a7ee9d97cd8bd4d, type: 2}
		- {fileID: 11400000, guid: e0963f52efb19214aba426485adb36fc, type: 2}
		- {fileID: 11400000, guid: ac092a30c9636394087209809ac6dbba, type: 2}