Conjure/ludumdare50
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Integrated into SampleScene

Browse Source
This commit is contained in:
Jason Durand 01 2022-04-02 22:46:47 -04:00
parent 4c73354230
commit 9b9a4a7380
3 changed files with 114 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
Assets/Prefabs/Arena.prefab
View File

@ -82,6 +82,36 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3828557005618319923
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2672917030292862467}
m_Layer: 0
m_Name: Graveyard
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2672917030292862467
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3828557005618319923}
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_Children: []
m_Father: {fileID: 9196727425507610130}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4442416359220029476
GameObject:
m_ObjectHideFlags: 0
@ -164,6 +194,66 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6020474456122093269
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9160143333944243421}
m_Layer: 0
m_Name: Gladiators
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9160143333944243421
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6020474456122093269}
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_Children: []
m_Father: {fileID: 9196727425507610130}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7392446146128619947
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7043516730020716896}
m_Layer: 0
m_Name: Minions
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7043516730020716896
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7392446146128619947}
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_Children: []
m_Father: {fileID: 9196727425507610130}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9196727423716235681
GameObject:
m_ObjectHideFlags: 0
@ -248,7 +338,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
<Stats>k__BackingField: {fileID: 11400000, guid: 188711c0b201b1a45ad601ee20233b20, type: 2}
moatCollider: {fileID: 9196727423716235687}
globalCamera: {fileID: 0}
--- !u!1 &9196727423754814335
GameObject:
m_ObjectHideFlags: 0
@ -1739,6 +1828,9 @@ Transform:
- {fileID: 9196727425198182340}
- {fileID: 9196727423716235680}
- {fileID: 9196727424792191263}
- {fileID: 9160143333944243421}
- {fileID: 7043516730020716896}
- {fileID: 2672917030292862467}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1770,6 +1862,9 @@ MonoBehaviour:
direction: {x: 0, y: 1}
stats: {fileID: 11400000, guid: fe319ad8c9a37b84e8b45268c913d54c, type: 2}
entityPrefab: {fileID: 197677485360569561, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
<gladiatorParent>k__BackingField: {fileID: 9160143333944243421}
<minionParent>k__BackingField: {fileID: 7043516730020716896}
<graveyard>k__BackingField: {fileID: 2672917030292862467}
--- !u!114 &1359990806
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1783,4 +1878,5 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
gameTimer: {fileID: 0}
<Paused>k__BackingField: 1
<pauseLevel>k__BackingField: 1
startPrompt: {fileID: 0}

15
Assets/Scenes/SampleScene.unity
View File

@ -134,6 +134,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 56c3e06ea5db48a40a7f55e72291cb0d, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &397851252 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: -7596782781093632548, guid: 581322f036f3ff1448d4d2ec70f295a4, type: 3}
m_PrefabInstance: {fileID: 1359990804}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72794012913ccd840a73788b90573212, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &647315810
PrefabInstance:
m_ObjectHideFlags: 0
@ -656,6 +667,10 @@ PrefabInstance:
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: arena
value:
objectReference: {fileID: 397851252}
- target: {fileID: 1967503440015794769, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
propertyPath: gameFlowManager
value:

5
Assets/Scripts/MinionThrower.cs
View File

@ -9,9 +9,6 @@ public class MinionThrower : MonoBehaviour {
[SerializeField] [Required]
GameFlowManager gameFlowManager = null!;
[SerializeField] [Required]
Transform minionParent = null!;
public Entity[] minionPrefabs;
public GameObject aimArrow;
@ -81,7 +78,7 @@ public class MinionThrower : MonoBehaviour {
currentCooldownTimer = currentInitialCooldown;
minionBar.UpdateReload(currentCooldownTimer / currentInitialCooldown);
var newMinion = Instantiate(minionBar.GetCurrentMinion().gameObject, minionParent)
var newMinion = Instantiate(minionBar.GetCurrentMinion().gameObject, arena.minionParent)
.GetComponent<Monster>();
newMinion.arena = arena;
newMinion.transform.position = transform.position + new Vector3(throwDirection.x, throwDirection.y, 0f) * 1f;