diff options
Diffstat (limited to 'SurvivalTest/Assets/Scripts')
23 files changed, 268 insertions, 103 deletions
diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs index bda8b81..334609d 100644 --- a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs +++ b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs @@ -5,6 +5,10 @@ using UnityEngine; public abstract class EquipBase { + public abstract string name { get; } + + public abstract string iconPath { get; } + /// <summary> /// Á¬·¢Ä£Ê½ /// </summary> diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs index be1645b..c00ebc4 100644 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs @@ -9,6 +9,10 @@ public class Equip_Boomerang : EquipBase { public override AutoMode autoMode => AutoMode.Condition; + public override string name => ""; + + public override string iconPath => ""; + /// <summary> /// ½Óµ½»ØÐýïÚºóÖØÐÂÖÀ³ö£¬·ñÔò¼ä¸ôÒ»¶Îʱ¼äͶÖÀ /// </summary> diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs index 6e3eb26..090c3ab 100644 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs @@ -7,12 +7,45 @@ using UnityEngine; /// </summary> public class Equip_GrenadeLauncher : EquipBase { + + public override string name => "Áñµ¯·¢ÉäÆ÷"; + + public override string iconPath => "art/ui/equipicon/grenade"; + public override AutoMode autoMode => AutoMode.Interval; public override float interval => 0.5f; + private string prefabPath = "prefabs/grenade/grenade_v1"; + + // ÌØЧvfx + private string vfxPath = "prefabs/effect/eff_launch"; + + Vector3 GetRandomLaunchGrenadeDirection(CrewScript crew) + { + Vector3 dirOnPlane = Quaternion.Euler(0, 0, Random.Range(-15f, 15f)) * new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0); + dirOnPlane = dirOnPlane.normalized; + Vector3 dir = new Vector3(dirOnPlane.x, dirOnPlane.y, Random.Range(0f, 1f)).normalized; + return dir.normalized; + } + + public override void OnTrigger(GameObject owner) { + Debug.Log("Grenade !!!"); + + CrewScript crew = owner.GetComponent<CrewScript>(); + + //// grenade + TestPeaceMakerGrenade grenade = UnityEngine.Object.Instantiate<TestPeaceMakerGrenade>(ResourceManager.Instance.Load<TestPeaceMakerGrenade>(prefabPath)); + Vector3 position = owner.GetComponent<TopDownTransform>().position + new Vector3(0, 0, 1.8f); + grenade.Set(position, GetRandomLaunchGrenadeDirection(crew), Random.Range(8f, 10f)); + grenade.gameObject.SetActive(true); + + //// vfx + GameObject eff = UnityEngine.Object.Instantiate<GameObject>(ResourceManager.Instance.Load<UnityEngine.GameObject>(vfxPath), crew.transform); + eff.transform.position = crew.launchPoint.position; + eff.SetActive(true); } }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs index 335e2a7..b370e66 100644 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs @@ -7,6 +7,11 @@ using UnityEngine; /// </summary> public class Equip_Gun : EquipBase { + + public override string name => "枪"; + + public override string iconPath => "art/ui/equipicon/gun"; + public override AutoMode autoMode => AutoMode.Interval; public override float interval => 0.1f; diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs index 1af4143..d5e4189 100644 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs @@ -7,6 +7,11 @@ using UnityEngine; /// </summary> public class Equip_MightyGlove : EquipBase { + + public override string name => ""; + + public override string iconPath => ""; + public override AutoMode autoMode => AutoMode.Interval; public override void OnTrigger(GameObject owner) diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs index 1546e1b..c0bdfc6 100644 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs @@ -7,6 +7,11 @@ using UnityEngine; /// </summary> public class Equip_TeslaCoil : EquipBase { + + public override string name => ""; + + public override string iconPath => ""; + public override AutoMode autoMode => AutoMode.Interval; public override float interval => 1f; diff --git a/SurvivalTest/Assets/Scripts/GameApp.cs b/SurvivalTest/Assets/Scripts/GameApp.cs index cfc93d9..2bbb5f4 100644 --- a/SurvivalTest/Assets/Scripts/GameApp.cs +++ b/SurvivalTest/Assets/Scripts/GameApp.cs @@ -6,12 +6,21 @@ using UnityEngine; public class GameApp : MonoBehaviour { - void Start() + public static GameApp Instance + { + get; + private set; + } + + private void Awake() + { + Instance = this; + } + + void Start() { PlayerManager.Instance.Init(); BattleManager.Instance.Init(); - - } void Update() diff --git a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs index 5301d85..4690e03 100644 --- a/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_B2Phone.cs @@ -9,7 +9,7 @@ public class Item_B2Phone : ItemBase { public override string name => "B2ºäÕ¨»ú"; - public override string iconPath => "art/ui/skillicon/plane"; + public override string iconPath => "art/ui/itemicon/plane"; string prefabPath = "prefabs/weapon/b2"; diff --git a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs index 73492ee..9a6cf19 100644 --- a/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs +++ b/SurvivalTest/Assets/Scripts/Items/Item_SpaceBeamer.cs @@ -6,7 +6,7 @@ public class Item_SpaceBeamer : ItemBase { public override string name => "Ì«¿ÕÉäÏß"; - public override string iconPath => "art/ui/skillicon/space_beamer"; + public override string iconPath => "art/ui/itemicon/space_beamer"; string prefabPath = "prefabs/weapon/space_beam"; diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs index 102bc34..4cdaa72 100644 --- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs @@ -8,6 +8,7 @@ public class BattleManager : Singleton<BattleManager> public void Init() { UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); + UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null); } public void Update() diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs index 59593b0..8bd1dd0 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -8,10 +8,6 @@ public partial class PlayerManager : Singleton<PlayerManager> // ½ÇÉ« private CrewScript m_Crew; - // ³ÖÓеÄ×°±¸ - public List<EquipBase> equips { get { return m_Equips; } } - private List<EquipBase> m_Equips = new List<EquipBase>(); - // ³ÖÓеÄÊÎÆ· public List<DecorationBase> decorations { get { return m_Decorations; } } private List<DecorationBase> m_Decorations = new List<DecorationBase>(); @@ -19,12 +15,15 @@ public partial class PlayerManager : Singleton<PlayerManager> public void Init() { InitItems(); - + InitEquips(); } public void Update() { + CheckInput(); + UpdateItems(); + UpdateEquips(); } public void SetCrew(CrewScript crew) diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs index ce85849..67e8ae7 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs @@ -2,9 +2,83 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; - public partial class PlayerManager : Singleton<PlayerManager> { + // ³ÖÓеÄ×°±¸ + public List<EquipBase> equips { get { return m_Equips; } } + private List<EquipBase> m_Equips = new List<EquipBase>(); + + private Coroutine m_CoFire; + + void InitEquips() + { + m_Equips.Add(new Equip_Gun()); + m_Equips.Add(new Equip_GrenadeLauncher()); + } + + /// <summary> + /// ×°±¸Ñ»· + /// </summary> + void UpdateEquips() + { + for(int i = 0; i < m_Equips.Count; ++i) + { + m_Equips[i].Update(); + } + } + + /// <summary> + /// ¼ì²éÊäÈ룬ʹÓÃ×°±¸ + /// </summary> + void CheckInput() + { + if (Input.GetButtonDown("Fire1") || (Input.GetAxis("GunTrigger") == 1)) + { + if (m_CoFire == null) + { + m_CoFire = GameApp.Instance.StartCoroutine(coFire()); + } + } + if (!Input.GetButton("Fire1") && (Input.GetAxis("GunTrigger") == 0)) + { + if (m_CoFire != null) + { + GameApp.Instance.StopCoroutine(m_CoFire); + m_CoFire = null; + } + } + } + + /// <summary> + /// ¿ª»ð + /// </summary> + /// <returns></returns> + IEnumerator coFire() + { + while (true) + { + for(int i = 0; i < m_Equips.Count; ++i) + { + EquipBase equip = m_Equips[i]; + if (equip == null) + continue; + if(equip.autoMode == EquipBase.AutoMode.Interval) + { + string id = equip.GetHashCode().ToString(); + float countDown = TinyCountDown.Instance.Get(id); + if(countDown <= 0) + { + equip.OnTrigger(m_Crew.gameObject); + TinyCountDown.Instance.Set(id, equip.interval); + } + else + { + } + } + } + yield return null; + } + } }
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs index a0cfe52..df924ca 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Items.cs @@ -8,37 +8,20 @@ public partial class PlayerManager : Singleton<PlayerManager> public List<ItemBase> items { get { return m_Items; } } private List<ItemBase> m_Items = new List<ItemBase>(); - // µ±Ç°Ñ¡ÖеÄÎïÆ· - ItemBase m_CurrentItem = null; - void InitItems() { m_Items.Add(new Item_B2Phone()); m_Items.Add(new Item_SpaceBeamer()); } - /// <summary> - /// Ñ¡ÖÐÎïÆ· - /// </summary> - public void SetCurrentItem(ItemBase item) + public void UseItem(ItemBase item) { - if (!items.Contains(item)) + if(!items.Contains(item)) { - Debug.LogError("No such item"); + Debug.LogError("No such item, name=" + item.name); return; } - m_CurrentItem = item; - } - - /// <summary> - /// ʹÓõ±Ç°µÀ¾ß - /// </summary> - public void UseCurrentItem() - { - if (m_CurrentItem == null) - return; - - m_CurrentItem.OnUse(m_Crew.gameObject); + item.OnUse(m_Crew.gameObject); } void UpdateItems() diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs index 033f198..7226ac9 100644 --- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs +++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs @@ -12,11 +12,26 @@ public class TestPeaceMaker : CrewScript [SerializeField] private SpriteRenderer m_Arrow; [SerializeField] private float m_ArrowRadius; [SerializeField] private TestPeaceMakerBullet m_Bullet; - [SerializeField] private TestPeaceMakerGrenade m_Grenade; [SerializeField] private Vector2 m_Zoom; - [SerializeField] private GameObject m_LaunchVfx; [SerializeField] private Transform m_LaunchPoint; + public override Vector2 aimDirection + { + get + { + return m_AimDirection; + } + } + + + public override Transform launchPoint + { + get + { + return m_LaunchPoint; + } + } + private Vector3 zoomIn { get @@ -39,7 +54,6 @@ public class TestPeaceMaker : CrewScript private SpriteRenderer m_SpriteRenderer; private TopDownTransform m_Coord; private Coroutine m_CoFire; - private Coroutine m_CoLaunchGrenade; private Vector3 m_PreMouse; @@ -79,11 +93,10 @@ public class TestPeaceMaker : CrewScript SetAim(); bool isFire = Fire(); - bool isGrenade = LaunchGrenade(); CameraFollow(); - CameraZoom(/*isMove ||*/ isFire || isGrenade /*|| isBeam*/); + CameraZoom(isFire); } void CameraZoom(bool zout) @@ -212,29 +225,6 @@ public class TestPeaceMaker : CrewScript return true; } - bool LaunchGrenade() - { - //if (Input.GetButtonDown("Fire2") || (Input.GetAxis("BombTrigger") == 1)) - if (Input.GetButtonDown("Fire1") || (Input.GetAxis("GunTrigger") == 1)) - { - if (m_CoLaunchGrenade == null) - { - m_CoLaunchGrenade = StartCoroutine(coLaunchGrenade(0.2f)); - } - } - //if (!Input.GetButton("Fire2") && (Input.GetAxis("BombTrigger") == 0)) - if (!Input.GetButton("Fire1") && (Input.GetAxis("GunTrigger") == 0)) - { - if (m_CoLaunchGrenade != null) - { - StopCoroutine(m_CoLaunchGrenade); - m_CoLaunchGrenade = null; - } - return false; - } - return true; - } - IEnumerator coFire(float interval) { while (true) @@ -262,32 +252,4 @@ public class TestPeaceMaker : CrewScript return bullet; } - - Vector3 GetRandomLaunchGrenadeDirection() - { - Vector3 dirOnPlane = Quaternion.Euler(0, 0, Random.Range(-15f, 15f)) * new Vector3(m_AimDirection.x, m_AimDirection.y, 0); - dirOnPlane = dirOnPlane.normalized; - Vector3 dir = new Vector3(dirOnPlane.x, dirOnPlane.y, Random.Range(0f, 1f)).normalized; - return dir.normalized; - } - - IEnumerator coLaunchGrenade(float interval) - { - while (true) - { - // grenade - TestPeaceMakerGrenade grenade = Instantiate<TestPeaceMakerGrenade>(m_Grenade); - Vector3 position = m_Coord.position + new Vector3(0, 0, 1.8f); - grenade.Set(position, GetRandomLaunchGrenadeDirection(), Random.Range(8f, 10f)); - grenade.gameObject.SetActive(true); - - // vfx - GameObject eff = Instantiate<GameObject>(m_LaunchVfx, this.transform); - eff.transform.position = m_LaunchPoint.transform.position; - eff.SetActive(true); - - yield return new WaitForSeconds(interval); - } - } - } diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs deleted file mode 100644 index dbec362..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PanelEquipBar : PanelBase -{ - public override void Set(object param) - { - } -} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta new file mode 100644 index 0000000..380d967 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26efe0e32407015498a94f7fe8930a70 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs new file mode 100644 index 0000000..1a7dae8 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs @@ -0,0 +1,38 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PanelEquipBar : PanelBase +{ + public UIEquipWidget m_EquipTemplate; + + public UISimpleGrid m_EquipGrid; + + private List<UIEquipWidget> m_Equips = new List<UIEquipWidget>(); + + public override void Set(object param) + { + for(int i = 0; i < PlayerManager.Instance.equips.Count; ++i) + { + UIEquipWidget widget = MakeEquipWidget(PlayerManager.Instance.equips[i]); + m_Equips.Add(widget); + } + } + + UIEquipWidget MakeEquipWidget(EquipBase equip) + { + UIEquipWidget widget = Instantiate<UIEquipWidget>(m_EquipTemplate); + widget.transform.SetParent(m_EquipGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "equip (" + equip.name + ")"; +#endif + + UIEquipWidgetParam param = new UIEquipWidgetParam(); + param.equip = equip; + widget.Set(param); + return widget; + } + +} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta index 8ef34db..bf78ef3 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.cs.meta +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19d70a7fc1ff38c4cb6ae04cf1530b7b +guid: f1382539f3296aa47b7e2d7f269f9007 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs new file mode 100644 index 0000000..bccd322 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public struct UIEquipWidgetParam +{ + public EquipBase equip; +} + +public class UIEquipWidget : UIGridItemBase +{ + public Image Image_Icon; + + public EquipBase equip { get { return m_Equip; } } + private EquipBase m_Equip; + + public override void Set(object param) + { + UIEquipWidgetParam info = (UIEquipWidgetParam)param; + m_Equip = info.equip; + + Image_Icon.sprite = ResourceManager.Instance.Load<Sprite>(info.equip.iconPath); + + } +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta new file mode 100644 index 0000000..bad655e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 83ab90093bb5312428311a589a4fe90f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs index 74f90c3..d426b84 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelItemBar/PanelItemBar.cs @@ -11,7 +11,6 @@ public class PanelItemBar : PanelBase public Text m_TextName; - // µ±Ç°³ÖÓеÄItems private List<ItemWidget> m_Items = new List<ItemWidget>(); private int m_CurrentIndex = 0; @@ -48,6 +47,9 @@ public class PanelItemBar : PanelBase widget.transform.SetParent(m_ItemGrid.transform); widget.gameObject.SetActive(true); widget.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "item (" + item.name + ")"; +#endif ItemWidgetParam param = new ItemWidgetParam(); //param.onSelected = OnSelectItemWidget; @@ -71,7 +73,7 @@ public class PanelItemBar : PanelBase if (UseItem()) { m_Items[m_CurrentIndex].OnUseCallback(); - PlayerManager.Instance.UseCurrentItem(); + PlayerManager.Instance.UseItem(m_Items[m_CurrentIndex].item); } } @@ -87,8 +89,6 @@ public class PanelItemBar : PanelBase m_TextName.text = m_Items[index].item.name; m_CurrentIndex = index; - - PlayerManager.Instance.SetCurrentItem(m_Items[index].item); } } diff --git a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs index d29c24a..bf2ada4 100644 --- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs +++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs @@ -9,6 +9,7 @@ public enum PanelType PanelLevelBar, PanelItemBar, + PanelEquipBar, } public partial class UIManager : Singleton<UIManager> @@ -27,6 +28,7 @@ public partial class UIManager : Singleton<UIManager> { AddPanel(PanelType.PanelLevelBar, "PanelLevelBar"); AddPanel(PanelType.PanelItemBar, "PanelItemBar"); + AddPanel(PanelType.PanelEquipBar, "PanelEquipBar"); } void AddPanel(PanelType type, string path) diff --git a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs index 6532317..4993cd7 100644 --- a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs +++ b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs @@ -5,4 +5,10 @@ using UnityEngine; public class CrewScript : MonoBehaviour { + // ³¯Ïò + public virtual Vector2 aimDirection { get; } + + // Áñµ¯·¢Éä¿Ú£¨Èç¹ûÓеĻ°£© + public virtual Transform launchPoint { get; } + } |