mirror of
https://github.com/kuhyx/WUT_Computer_Science.git
synced 2026-07-06 10:43:15 +02:00
added temp code for squad WIP for showcase
proabbly need to refactor stuff that starts with "Temp" and was added in this commit
This commit is contained in:
parent
2d1aa7cb9c
commit
e9f69fbd88
@ -296,6 +296,64 @@ MonoBehaviour:
|
|||||||
m_RequiresDepthTexture: 0
|
m_RequiresDepthTexture: 0
|
||||||
m_RequiresColorTexture: 0
|
m_RequiresColorTexture: 0
|
||||||
m_Version: 2
|
m_Version: 2
|
||||||
|
--- !u!1 &484241835
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 484241837}
|
||||||
|
- component: {fileID: 484241836}
|
||||||
|
- component: {fileID: 484241838}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: TempSquad
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &484241836
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 484241835}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: eeef7310a48872043b4089979ec88b42, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
soldiers: []
|
||||||
|
--- !u!4 &484241837
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 484241835}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 4.4048395, y: -4.749419, z: 13.353434}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 9
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &484241838
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 484241835}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 3a470f948c2458f4994fe0cf5f226c52, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1 &905024696
|
--- !u!1 &905024696
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
29
theProject/Assets/Scripts/Managers/TempSquadManager.cs
Normal file
29
theProject/Assets/Scripts/Managers/TempSquadManager.cs
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
// TEMP CODE JUST FOR SHOWCASE PURPOSES
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class TempSquadManager : MonoBehaviour
|
||||||
|
{
|
||||||
|
Squad playerSquad;
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
playerSquad = FindObjectOfType<Squad>();
|
||||||
|
}
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
Debug.Log("Added initial soldeirs to squad");
|
||||||
|
// add all ally soldiers to squad
|
||||||
|
var soldiers = FindObjectsOfType<Soldier>();
|
||||||
|
foreach(var soldier in soldiers)
|
||||||
|
{
|
||||||
|
if(soldier.TempGetOwnType() == Soldier.SoldierType.Ally)
|
||||||
|
{
|
||||||
|
playerSquad.TempAddSoldierToSquad(soldier);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta
Normal file
11
theProject/Assets/Scripts/Managers/TempSquadManager.cs.meta
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3a470f948c2458f4994fe0cf5f226c52
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -22,6 +22,12 @@ public class Soldier : MonoBehaviour
|
|||||||
|
|
||||||
[SerializeField] private TMP_Text nameText = null;
|
[SerializeField] private TMP_Text nameText = null;
|
||||||
[SerializeField] private TMP_Text healthPointsText = null;
|
[SerializeField] private TMP_Text healthPointsText = null;
|
||||||
|
|
||||||
|
public SoldierType TempGetOwnType()
|
||||||
|
{
|
||||||
|
return ourType;
|
||||||
|
}
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start(){
|
void Start(){
|
||||||
healthPoints = maxHealthPoints; // initialize health
|
healthPoints = maxHealthPoints; // initialize health
|
||||||
|
|||||||
@ -26,6 +26,11 @@ public class Squad : MonoBehaviour
|
|||||||
[SerializeField] private List<Soldier> soldiers = new List<Soldier>(); // soldiers belonging to the squad
|
[SerializeField] private List<Soldier> soldiers = new List<Soldier>(); // soldiers belonging to the squad
|
||||||
private Queue<Order> orders = new Queue<Order>(); // orders given to the squad
|
private Queue<Order> orders = new Queue<Order>(); // orders given to the squad
|
||||||
|
|
||||||
|
public void TempAddSoldierToSquad(Soldier soldier)
|
||||||
|
{
|
||||||
|
soldiers.Add(soldier);
|
||||||
|
}
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
TickSystem.OnTick += HandleTick;
|
TickSystem.OnTick += HandleTick;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user