diff options
Diffstat (limited to 'SurvivalTest/Assets/Scripts')
14 files changed, 127 insertions, 2 deletions
diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs new file mode 100644 index 0000000..e8814cd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Decoration_Battery : DecorationBase +{ + public override string name => "电池"; + + public override string iconPath => "art/ui/decoration/battery"; + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta new file mode 100644 index 0000000..ab1ca1d --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_Battery.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 18bc88c977364ba4db2e0b1499a839be +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs new file mode 100644 index 0000000..1ebb021 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// <summary> +/// 剑谱，持有之后按照招式舞动会有剑气等附加效果 +/// </summary> +public class Decoration_SwordSpectrum : DecorationBase +{ + + public override string name => "剑术大师的剑谱"; + + public override string iconPath => "art/ui/decoration/spectrum"; + +}
\ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta new file mode 100644 index 0000000..1dc4d34 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Decorations/Decoration_SwordSpectrum.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1c73c7e0a378c30408a7f06bb38bf06f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun.meta new file mode 100644 index 0000000..901bfca --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/RailGun.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58852a4f6155748468fd8812fd61446d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs new file mode 100644 index 0000000..e83614c --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Equip_RailGun : 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/RailGun/Equip_RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta new file mode 100644 index 0000000..6d71ccc --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9a37b2731565934eb4ef0f95a64aaea +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs new file mode 100644 index 0000000..0ffb5eb --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class RailGun : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta new file mode 100644 index 0000000..28040c3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 840b1c98faf9e654abb4f09bf46fb3f5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs index 681e87b..701f27c 100644 --- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs @@ -8,7 +8,7 @@ public class BattleManager : Singleton<BattleManager> public void Init() { UIManager.Instance.OpenPanel(PanelType.PanelTopSuffBar, null); - UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null); + //UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null); } diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs index 5076dea..ea4ba78 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Decorations.cs @@ -15,6 +15,8 @@ public partial class PlayerManager : Singleton<PlayerManager> m_Decorations.Add(new Decoration_MystreyMask()); m_Decorations.Add(new Decoration_PowerRing()); m_Decorations.Add(new Decoration_Horn()); + m_Decorations.Add(new Decoration_Battery()); + m_Decorations.Add(new Decoration_SwordSpectrum()); } void UpdateDecorations() diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs index d921545..7f50ea9 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs @@ -19,12 +19,12 @@ public partial class PlayerManager : Singleton<PlayerManager> void InitEquips() { + m_Equips.Add(new Equip_LightSaber()); m_Equips.Add(new Equip_Gun()); m_Equips.Add(new Equip_GrenadeLauncher()); m_Equips.Add(new Equip_Boomerang()); m_Equips.Add(new Equip_TeslaCoil()); m_Equips.Add(new Equip_MightyGlove()); - m_Equips.Add(new Equip_LightSaber()); m_AutoFire = false; diff --git a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs index 775b913..57bd46f 100644 --- a/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs +++ b/SurvivalTest/Assets/Scripts/Test/TestPeaceMaker.cs @@ -15,6 +15,14 @@ public class TestPeaceMaker : CrewScript [SerializeField] private Vector2 m_Zoom; [SerializeField] private Transform m_LaunchPoint; + public override Transform centre + { + get + { + return m_Centre; + } + } + public override Vector2 aimDirection { get diff --git a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs index 348e793..bb7bd22 100644 --- a/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs +++ b/SurvivalTest/Assets/Scripts/Unit/Crew/CrewScript.cs @@ -5,6 +5,9 @@ using UnityEngine; public class CrewScript : MonoBehaviour { + // 几何中心锚点（作为arrow，武器的对准中心，3D空间下） + public virtual Transform centre { get; } + // 朝向 public virtual Vector2 aimDirection { get; } |