From 71ae3d755a03a706d93291ca57c6de8e6f0d5926 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 25 Apr 2022 09:58:56 +0800 Subject: * rename equip to weapon --- SurvivalTest/Assets/Scripts/Equips.meta | 8 -- SurvivalTest/Assets/Scripts/Equips/EquipBase.cs | 66 ---------- .../Assets/Scripts/Equips/EquipBase.cs.meta | 11 -- .../Assets/Scripts/Equips/Equip_Boomerang.cs | 34 ----- .../Assets/Scripts/Equips/Equip_Boomerang.cs.meta | 11 -- .../Assets/Scripts/Equips/Equip_GrenadeLauncher.cs | 49 -------- .../Scripts/Equips/Equip_GrenadeLauncher.cs.meta | 11 -- SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs | 57 --------- .../Assets/Scripts/Equips/Equip_Gun.cs.meta | 11 -- .../Assets/Scripts/Equips/Equip_MightyGlove.cs | 22 ---- .../Scripts/Equips/Equip_MightyGlove.cs.meta | 11 -- .../Assets/Scripts/Equips/Equip_TeslaCoil.cs | 23 ---- .../Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta | 11 -- SurvivalTest/Assets/Scripts/Equips/LightSaber.meta | 8 -- .../Scripts/Equips/LightSaber/Equip_LightSaber.cs | 63 ---------- .../Equips/LightSaber/Equip_LightSaber.cs.meta | 11 -- .../Assets/Scripts/Equips/LightSaber/LightSaber.cs | 18 --- .../Scripts/Equips/LightSaber/LightSaber.cs.meta | 11 -- SurvivalTest/Assets/Scripts/Equips/RailGun.meta | 8 -- .../Assets/Scripts/Equips/RailGun/Equip_RailGun.cs | 16 --- .../Scripts/Equips/RailGun/Equip_RailGun.cs.meta | 11 -- .../Assets/Scripts/Equips/RailGun/RailGun.cs | 18 --- .../Assets/Scripts/Equips/RailGun/RailGun.cs.meta | 11 -- .../Assets/Scripts/Managers/BattleManager.cs | 2 +- .../Assets/Scripts/Managers/PlayerManager.cs | 6 +- .../Scripts/Managers/PlayerManager_Equips.cs | 140 --------------------- .../Scripts/Managers/PlayerManager_Equips.cs.meta | 11 -- .../Scripts/Managers/PlayerManager_Weapons.cs | 140 +++++++++++++++++++++ .../Scripts/Managers/PlayerManager_Weapons.cs.meta | 11 ++ .../Assets/Scripts/UI/Panel/PanelEquipBar.meta | 8 -- .../UI/Panel/PanelEquipBar/PanelEquipBar.cs | 40 ------ .../UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta | 11 -- .../UI/Panel/PanelEquipBar/UIEquipWidget.cs | 39 ------ .../UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta | 11 -- .../UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs | 4 +- .../UI/Panel/PanelTopStuffBar/UIEquipBar.cs | 41 ------ .../UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta | 11 -- .../UI/Panel/PanelTopStuffBar/UIWeaponBar.cs | 41 ++++++ .../UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta | 11 ++ .../Assets/Scripts/UI/Panel/PanelWeaponBar.meta | 8 ++ .../UI/Panel/PanelWeaponBar/PanelWeaponBar.cs | 40 ++++++ .../UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta | 11 ++ .../UI/Panel/PanelWeaponBar/UIWeaponWidget.cs | 39 ++++++ .../UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta | 11 ++ SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs | 4 +- SurvivalTest/Assets/Scripts/Weapons.meta | 8 ++ .../Assets/Scripts/Weapons/LightSaber.meta | 8 ++ .../Scripts/Weapons/LightSaber/LightSaber.cs | 18 +++ .../Scripts/Weapons/LightSaber/LightSaber.cs.meta | 11 ++ .../Weapons/LightSaber/Weapon_LightSaber.cs | 63 ++++++++++ .../Weapons/LightSaber/Weapon_LightSaber.cs.meta | 11 ++ SurvivalTest/Assets/Scripts/Weapons/RailGun.meta | 8 ++ .../Assets/Scripts/Weapons/RailGun/RailGun.cs | 18 +++ .../Assets/Scripts/Weapons/RailGun/RailGun.cs.meta | 11 ++ .../Scripts/Weapons/RailGun/Weapon_RailGun.cs | 16 +++ .../Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta | 11 ++ SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs | 66 ++++++++++ .../Assets/Scripts/Weapons/WeaponBase.cs.meta | 11 ++ .../Assets/Scripts/Weapons/Weapon_Boomerang.cs | 34 +++++ .../Scripts/Weapons/Weapon_Boomerang.cs.meta | 11 ++ .../Scripts/Weapons/Weapon_GrenadeLauncher.cs | 49 ++++++++ .../Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta | 11 ++ SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs | 57 +++++++++ .../Assets/Scripts/Weapons/Weapon_Gun.cs.meta | 11 ++ .../Assets/Scripts/Weapons/Weapon_MightyGlove.cs | 22 ++++ .../Scripts/Weapons/Weapon_MightyGlove.cs.meta | 11 ++ .../Assets/Scripts/Weapons/Weapon_TeslaCoil.cs | 23 ++++ .../Scripts/Weapons/Weapon_TeslaCoil.cs.meta | 11 ++ 68 files changed, 820 insertions(+), 820 deletions(-) delete mode 100644 SurvivalTest/Assets/Scripts/Equips.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/EquipBase.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs delete mode 100644 SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs delete mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs create mode 100644 SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs delete mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs create mode 100644 SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs create mode 100644 SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta (limited to 'SurvivalTest/Assets/Scripts') diff --git a/SurvivalTest/Assets/Scripts/Equips.meta b/SurvivalTest/Assets/Scripts/Equips.meta deleted file mode 100644 index 0cc5388..0000000 --- a/SurvivalTest/Assets/Scripts/Equips.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 09f9eba1fb9f9ac4aaf7bb4f335eb9f1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs deleted file mode 100644 index ff8a198..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public abstract class EquipBase -{ - - public abstract string name { get; } - - public abstract string iconPath { get; } - - /// - /// Á¬·¢Ä£Ê½ - /// - public enum AutoMode - { - Interval, // °´Ê±Á¬·¢£¬ÐèÒªÉèÖÃInterval - Condition, // °´Ìõ¼þ´¥·¢£¬ÐèÒªÖØдCheckCondition - Always, // ³£×¤ - } - - public abstract AutoMode autoMode { get; } - - /// - /// ´¥·¢µÄʱ¼ä¼ä¸ô - /// - public virtual float interval { get; } - - /// - /// ³õʼ»¯ - /// - public virtual void OnInitialize(GameObject owner) - { - } - - /// - /// Ïú»Ù - /// - /// - public virtual void OnDestroy(GameObject owner) - { - } - - /// - /// ʹÓÃ×°±¸ - /// - public abstract void OnTrigger(GameObject owner); - - public virtual bool CheckCondition(GameObject owner) - { - return false; - } - - /// - /// Í£Ö¹¿ª»ð - /// - /// - public virtual void OnStop(GameObject owner) - { - } - - public virtual void Update(GameObject owner) - { - } - -} diff --git a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta b/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta deleted file mode 100644 index 23e0a00..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/EquipBase.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a9ad03a26b4af7a42a81bd9216665ebb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs deleted file mode 100644 index 8e3d917..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// »ØÐýïÚ -/// -public class Equip_Boomerang : EquipBase -{ - public override AutoMode autoMode => AutoMode.Condition; - - public override string name => "»ØÐýïÚ"; - - public override string iconPath => "art/ui/equipicon/boomerang"; - - /// - /// ½Óµ½»ØÐýïÚºóÖØÐÂÖÀ³ö£¬·ñÔò¼ä¸ôÒ»¶Îʱ¼äͶÖÀ - /// - /// - /// - public override bool CheckCondition(GameObject owner) - { - return false; - } - - public override void OnTrigger(GameObject owner) - { - } - - public override void Update(GameObject owner) - { - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta deleted file mode 100644 index dc65c95..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Boomerang.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: de55161bf2db13f48b0192e0c4fcbcfa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs deleted file mode 100644 index cd020a0..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// Áñµ¯·¢ÉäÆ÷ -/// -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) - { - CrewScript crew = owner.GetComponent(); - - // grenade - TestPeaceMakerGrenade grenade = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(prefabPath)); - Vector3 position = owner.GetComponent().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(ResourceManager.Instance.Load(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_GrenadeLauncher.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta deleted file mode 100644 index 0664e49..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8576c95cf1a888f41be5cb6907cd02bc -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs deleted file mode 100644 index 8daf999..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs +++ /dev/null @@ -1,57 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// 枪 -/// -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; - - private string prefabPath = "prefabs/bullet/bullet"; - - private int index = 0; - - TestPeaceMakerBullet CreateBullet(CrewScript crew, Vector2 dir, float speed, float lifeTime) - { - TestPeaceMakerBullet bullet = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load< TestPeaceMakerBullet>(prefabPath)); - - bullet.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * -0.3f; - - bullet.Set(dir, speed, lifeTime); - bullet.gameObject.SetActive(true); - - return bullet; - } - - public override void OnTrigger(GameObject owner) - { - CrewScript crew = owner.GetComponent(); - - index++; - index = index % 3; - - if(index == 0) - { - CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, -10 * Mathf.Deg2Rad), 12f, 2f); - } - else if(index == 1) - { - CreateBullet(crew, crew.aimDirection, 12f, 2f); - } - else if(index == 2) - { - CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, 10 * Mathf.Deg2Rad), 12f, 2f); - } - - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta deleted file mode 100644 index 0388d5b..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_Gun.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3e3705ee478644d4092b29376c9173ad -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs deleted file mode 100644 index 6a05b18..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// ³¬·²ÊÖÌ×£¬¼¯ÆëÎå¿Å±¦Ê¯ÊÎÆ·½âËø³¬Îä -/// -public class Equip_MightyGlove : EquipBase -{ - - public override string name => "³¬·²ÊÖÌ×"; - - public override string iconPath => "art/ui/equipicon/glove"; - - public override AutoMode autoMode => AutoMode.Interval; - - public override float interval => 100f; - - public override void OnTrigger(GameObject owner) - { - } -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta deleted file mode 100644 index 1a7c505..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_MightyGlove.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3fb783e0a66c9e349bbd4a5c0d51a55b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs deleted file mode 100644 index af523cd..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -/// -/// ÌØ˹À­ÏßȦ -/// -public class Equip_TeslaCoil : EquipBase -{ - - public override string name => "ÌØ˹À­ÏßȦ"; - - public override string iconPath => "art/ui/equipicon/tesla_coil"; - - public override AutoMode autoMode => AutoMode.Interval; - - public override float interval => 20f; - - public override void OnTrigger(GameObject owner) - { - } - -} diff --git a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta b/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta deleted file mode 100644 index b8d5d7f..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_TeslaCoil.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d7080bdedf9532d4bb649fe643619fab -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta b/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta deleted file mode 100644 index 1920297..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 253a4032920545c4488fd1eeedac07e3 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs b/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs deleted file mode 100644 index 9066884..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Equip_LightSaber : EquipBase -{ - public override string name => "¹â½£"; - - public override string iconPath => "art/ui/equipicon/light_saber"; - - public override AutoMode autoMode => AutoMode.Condition; - - private string lightSaberPrefabPath = "prefabs/weapon/light_saber"; - - private bool isWielding = false; - - private LightSaber m_LightSaber; - - private TopDownTransform m_TopDownTransform; - - private float m_Dist = 0.2f; - - public override void OnInitialize(GameObject owner) - { - m_LightSaber = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(lightSaberPrefabPath)); - m_TopDownTransform = m_LightSaber.gameObject.GetComponent(); - SetLightSaberPositionAndRotation(owner.GetComponent()); - m_LightSaber.gameObject.SetActive(false); - } - - public override bool CheckCondition(GameObject owner) - { - return true; - } - - public override void OnTrigger(GameObject owner) - { - if (isWielding) - return; - isWielding = true; - - m_LightSaber.gameObject.SetActive(true); - } - - public override void OnStop(GameObject owner) - { - isWielding = false; - m_LightSaber.gameObject.SetActive(false); - } - - public override void Update(GameObject owner) - { - CrewScript crew = owner.GetComponent(); - SetLightSaberPositionAndRotation(crew); - } - - void SetLightSaberPositionAndRotation(CrewScript crew) - { - m_LightSaber.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * m_Dist; - m_LightSaber.transform.rotation = Quaternion.Euler(0, 0, Mathf.Atan2(crew.aimDirection.y, crew.aimDirection.x) * Mathf.Rad2Deg); - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta deleted file mode 100644 index dcc1028..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/Equip_LightSaber.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cf80263cc579a3c46887c696a8f09d56 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs b/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs deleted file mode 100644 index 4db08ee..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LightSaber : 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/LightSaber/LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta deleted file mode 100644 index e8200d8..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/LightSaber/LightSaber.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 72f3d28485a45ba4b8906603b170f9fa -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 deleted file mode 100644 index 901bfca..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index e83614c..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 6d71ccc..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/Equip_RailGun.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 0ffb5eb..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs +++ /dev/null @@ -1,18 +0,0 @@ -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 deleted file mode 100644 index 28040c3..0000000 --- a/SurvivalTest/Assets/Scripts/Equips/RailGun/RailGun.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -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 701f27c..c473a5d 100644 --- a/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/BattleManager.cs @@ -10,7 +10,7 @@ public class BattleManager : Singleton UIManager.Instance.OpenPanel(PanelType.PanelTopSuffBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelBossHpBar, null); //UIManager.Instance.OpenPanel(PanelType.PanelItemBar, null); - //UIManager.Instance.OpenPanel(PanelType.PanelEquipBar, null); + //UIManager.Instance.OpenPanel(PanelType.PanelWeaponBar, null); } public void Update() diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs index bb97ce3..bae437e 100644 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager.cs @@ -11,7 +11,7 @@ public partial class PlayerManager : Singleton public void Init() { InitItems(); - InitEquips(); + InitWeapons(); InitDecorations(); } @@ -20,14 +20,14 @@ public partial class PlayerManager : Singleton CheckInput(); UpdateItems(); - UpdateEquips(); + UpdateWeapons(); UpdateDecorations(); } public void SetCrew(CrewScript crew) { m_Crew = crew; - m_Equips.ForEach(e => e.OnInitialize(crew.gameObject)); + m_Weapons.ForEach(e => e.OnInitialize(crew.gameObject)); } } \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs deleted file mode 100644 index 7f50ea9..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs +++ /dev/null @@ -1,140 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public partial class PlayerManager : Singleton -{ - // ³ÖÓеÄ×°±¸ - public List equips { get { return m_Equips; } } - private List m_Equips = new List(); - - private Coroutine m_CoFire; - - public bool isFire { get; private set; } - - private bool m_AutoFire; - private float m_AutoFireDuration = 0.8f; - - private float m_LastAxisValue = 0; - - 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_AutoFire = false; - - m_LastAxisValue = Input.GetAxisRaw("GunTrigger"); - } - - /// - /// ×°±¸Ñ­»· - /// - void UpdateEquips() - { - for(int i = 0; i < m_Equips.Count; ++i) - { - m_Equips[i].Update(m_Crew.gameObject); - } - } - - /// - /// ¼ì²éÊäÈ룬ʹÓÃ×°±¸ - /// - void CheckInput() - { - float axis = Input.GetAxisRaw("GunTrigger"); - - if (Input.GetButtonDown("Fire1") || (axis == 1 && m_LastAxisValue != 1)) - { - if(m_AutoFire) - { - m_AutoFire = false; - } - - isFire = true; - RunFireCoroutine(true); - } - - if (!m_AutoFire && !Input.GetButton("Fire1") && (axis == 0 && m_LastAxisValue != 0)) - { - if (TinyCountDown.Instance.Get("ReleaseFire") > 0) - { - m_AutoFire = true; - isFire = true; - RunFireCoroutine(true); - } - else - { - TinyCountDown.Instance.Set("ReleaseFire", m_AutoFireDuration); - isFire = false; - RunFireCoroutine(false); - } - } - - m_LastAxisValue = axis; - } - - void RunFireCoroutine(bool start) - { - if (start) - { - if (m_CoFire == null) - { - m_CoFire = GameApp.Instance.StartCoroutine(coFire()); - } - } - else - { - if (m_CoFire != null) - { - GameApp.Instance.StopCoroutine(m_CoFire); - m_Equips.ForEach(e => e.OnStop(m_Crew.gameObject)); - m_CoFire = null; - } - } - } - - /// - /// ×ÔÓÉ¿ª»ð - /// - /// - 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); // µ¹¼ÆʱÍÑÀëfireµ¥¶À¼Æʱ - if(countDown <= 0) - { - equip.OnTrigger(m_Crew.gameObject); - TinyCountDown.Instance.Set(id, equip.interval); - } - else - { - } - } - else if(equip.autoMode == EquipBase.AutoMode.Condition) - { - if(equip.CheckCondition(m_Crew.gameObject)) - { - equip.OnTrigger(m_Crew.gameObject); - } - } - } - yield return null; - } - } - -} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta deleted file mode 100644 index c43b512..0000000 --- a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Equips.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 19dc8d657411e8d47a563a47442d687d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs new file mode 100644 index 0000000..381beb8 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs @@ -0,0 +1,140 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public partial class PlayerManager : Singleton +{ + // ³ÖÓеÄ×°±¸ + public List weapons { get { return m_Weapons; } } + private List m_Weapons = new List(); + + private Coroutine m_CoFire; + + public bool isFire { get; private set; } + + private bool m_AutoFire; + private float m_AutoFireDuration = 0.8f; + + private float m_LastAxisValue = 0; + + void InitWeapons() + { + m_Weapons.Add(new Weapon_LightSaber()); + m_Weapons.Add(new Weapon_Gun()); + m_Weapons.Add(new Weapon_GrenadeLauncher()); + m_Weapons.Add(new Weapon_Boomerang()); + m_Weapons.Add(new Weapon_TeslaCoil()); + m_Weapons.Add(new Weapon_MightyGlove()); + + m_AutoFire = false; + + m_LastAxisValue = Input.GetAxisRaw("GunTrigger"); + } + + /// + /// ×°±¸Ñ­»· + /// + void UpdateWeapons() + { + for(int i = 0; i < m_Weapons.Count; ++i) + { + m_Weapons[i].Update(m_Crew.gameObject); + } + } + + /// + /// ¼ì²éÊäÈ룬ʹÓÃ×°±¸ + /// + void CheckInput() + { + float axis = Input.GetAxisRaw("GunTrigger"); + + if (Input.GetButtonDown("Fire1") || (axis == 1 && m_LastAxisValue != 1)) + { + if(m_AutoFire) + { + m_AutoFire = false; + } + + isFire = true; + RunFireCoroutine(true); + } + + if (!m_AutoFire && !Input.GetButton("Fire1") && (axis == 0 && m_LastAxisValue != 0)) + { + if (TinyCountDown.Instance.Get("ReleaseFire") > 0) + { + m_AutoFire = true; + isFire = true; + RunFireCoroutine(true); + } + else + { + TinyCountDown.Instance.Set("ReleaseFire", m_AutoFireDuration); + isFire = false; + RunFireCoroutine(false); + } + } + + m_LastAxisValue = axis; + } + + void RunFireCoroutine(bool start) + { + if (start) + { + if (m_CoFire == null) + { + m_CoFire = GameApp.Instance.StartCoroutine(coFire()); + } + } + else + { + if (m_CoFire != null) + { + GameApp.Instance.StopCoroutine(m_CoFire); + m_Weapons.ForEach(e => e.OnStop(m_Crew.gameObject)); + m_CoFire = null; + } + } + } + + /// + /// ×ÔÓÉ¿ª»ð + /// + /// + IEnumerator coFire() + { + while (true) + { + for(int i = 0; i < m_Weapons.Count; ++i) + { + WeaponBase weapon = m_Weapons[i]; + if (weapon == null) + continue; + if(weapon.autoMode == WeaponBase.AutoMode.Interval) + { + string id = weapon.GetHashCode().ToString(); + float countDown = TinyCountDown.Instance.Get(id); // µ¹¼ÆʱÍÑÀëfireµ¥¶À¼Æʱ + if(countDown <= 0) + { + weapon.OnTrigger(m_Crew.gameObject); + TinyCountDown.Instance.Set(id, weapon.interval); + } + else + { + } + } + else if(weapon.autoMode == WeaponBase.AutoMode.Condition) + { + if(weapon.CheckCondition(m_Crew.gameObject)) + { + weapon.OnTrigger(m_Crew.gameObject); + } + } + } + yield return null; + } + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta new file mode 100644 index 0000000..baba6a3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Managers/PlayerManager_Weapons.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dc3ba8ee467185942a84fa7c6ced6ec9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta deleted file mode 100644 index 380d967..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 03ee945..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PanelEquipBar : PanelBase -{ - public UIEquipWidget m_EquipTemplate; - - public UISimpleGrid m_EquipGrid; - - private List m_Equips = new List(); - - public override void Set(object param) - { - m_EquipTemplate.gameObject.SetActive(false); - - 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(m_EquipTemplate); - widget.transform.SetParent(m_EquipGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent().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/PanelEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta deleted file mode 100644 index bf78ef3..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f1382539f3296aa47b7e2d7f269f9007 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs deleted file mode 100644 index 9099f18..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs +++ /dev/null @@ -1,39 +0,0 @@ -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 Image Image_CD; - - 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(info.equip.iconPath); - - Image_CD.gameObject.SetActive(equip.autoMode == EquipBase.AutoMode.Interval); - } - - private void Update() - { - if(equip.autoMode == EquipBase.AutoMode.Interval) - { - float countDown = TinyCountDown.Instance.Get(equip.GetHashCode().ToString()); - float t = countDown / equip.interval; - Image_CD.fillAmount = t; - } - } - -} \ 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 deleted file mode 100644 index bad655e..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/UIEquipWidget.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -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/PanelTopStuffBar/PanelTopStuffBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs index 2d1e02b..6e91c6b 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/PanelTopStuffBar.cs @@ -4,13 +4,13 @@ using UnityEngine; public class PanelTopStuffBar : PanelBase { - public UIEquipBar m_EquipBar; + public UIWeaponBar m_WeaponBar; public UIItemBar m_ItemBar; public UIDecorationBar m_DecorationBar; public override void Set(object param) { - m_EquipBar.Set(); + m_WeaponBar.Set(); m_ItemBar.Set(); m_DecorationBar.Set(); } diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs deleted file mode 100644 index d658663..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class UIEquipBar : MonoBehaviour -{ - public UIEquipWidget m_EquipTemplate; - - public UISimpleGrid m_EquipGrid; - - private List m_Equips = new List(); - - public void Set() - { - m_EquipTemplate.gameObject.SetActive(false); - - 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(m_EquipTemplate); - widget.transform.SetParent(m_EquipGrid.transform); - widget.gameObject.SetActive(true); - widget.GetComponent().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/PanelTopStuffBar/UIEquipBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta deleted file mode 100644 index 68bf843..0000000 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIEquipBar.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3eefcc4321abff24e88f7cbb843e3fda -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs new file mode 100644 index 0000000..96e6cfd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs @@ -0,0 +1,41 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class UIWeaponBar : MonoBehaviour +{ + public UIWeaponWidget m_WeaponTemplate; + + public UISimpleGrid m_WeaponGrid; + + private List m_Weapons = new List(); + + public void Set() + { + m_WeaponTemplate.gameObject.SetActive(false); + + for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i) + { + UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]); + m_Weapons.Add(widget); + } + } + + UIWeaponWidget MakeWeaponWidget(WeaponBase weapon) + { + UIWeaponWidget widget = Instantiate(m_WeaponTemplate); + widget.transform.SetParent(m_WeaponGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "weapon (" + weapon.name + ")"; +#endif + + UIWeaponWidgetParam param = new UIWeaponWidgetParam(); + param.weapon = weapon; + widget.Set(param); + return widget; + } + + +} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta new file mode 100644 index 0000000..68bf843 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelTopStuffBar/UIWeaponBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3eefcc4321abff24e88f7cbb843e3fda +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta new file mode 100644 index 0000000..380d967 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26efe0e32407015498a94f7fe8930a70 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs new file mode 100644 index 0000000..24c208c --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PanelWeaponBar : PanelBase +{ + public UIWeaponWidget m_WeaponTemplate; + + public UISimpleGrid m_WeaponGrid; + + private List m_Weapons = new List(); + + public override void Set(object param) + { + m_WeaponTemplate.gameObject.SetActive(false); + + for (int i = 0; i < PlayerManager.Instance.weapons.Count; ++i) + { + UIWeaponWidget widget = MakeWeaponWidget(PlayerManager.Instance.weapons[i]); + m_Weapons.Add(widget); + } + } + + UIWeaponWidget MakeWeaponWidget(WeaponBase weapon) + { + UIWeaponWidget widget = Instantiate(m_WeaponTemplate); + widget.transform.SetParent(m_WeaponGrid.transform); + widget.gameObject.SetActive(true); + widget.GetComponent().anchoredPosition = new Vector2(0, 0); +#if UNITY_EDITOR + widget.name = "weapon (" + weapon.name + ")"; +#endif + + UIWeaponWidgetParam param = new UIWeaponWidgetParam(); + param.weapon = weapon; + widget.Set(param); + return widget; + } + +} diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta new file mode 100644 index 0000000..bf78ef3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/PanelWeaponBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1382539f3296aa47b7e2d7f269f9007 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs new file mode 100644 index 0000000..f061a3b --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs @@ -0,0 +1,39 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public struct UIWeaponWidgetParam +{ + public WeaponBase weapon; +} + +public class UIWeaponWidget : UIGridItemBase +{ + public Image Image_Icon; + public Image Image_CD; + + public WeaponBase weapon { get { return m_Weapon; } } + private WeaponBase m_Weapon; + + public override void Set(object param) + { + UIWeaponWidgetParam info = (UIWeaponWidgetParam)param; + m_Weapon = info.weapon; + + Image_Icon.sprite = ResourceManager.Instance.Load(info.weapon.iconPath); + + Image_CD.gameObject.SetActive(weapon.autoMode == WeaponBase.AutoMode.Interval); + } + + private void Update() + { + if(weapon.autoMode == WeaponBase.AutoMode.Interval) + { + float countDown = TinyCountDown.Instance.Get(weapon.GetHashCode().ToString()); + float t = countDown / weapon.interval; + Image_CD.fillAmount = t; + } + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.cs.meta new file mode 100644 index 0000000..bad655e --- /dev/null +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelWeaponBar/UIWeaponWidget.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/UIManager_Panels.cs b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs index 02b3a06..649d685 100644 --- a/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs +++ b/SurvivalTest/Assets/Scripts/UI/UIManager_Panels.cs @@ -9,7 +9,7 @@ public enum PanelType PanelLevelBar, PanelItemBar, - PanelEquipBar, + PanelWeaponBar, PanelTopSuffBar, PanelBossHpBar, } @@ -30,7 +30,7 @@ public partial class UIManager : Singleton { AddPanel(PanelType.PanelLevelBar, "PanelLevelBar"); AddPanel(PanelType.PanelItemBar, "PanelItemBar"); - AddPanel(PanelType.PanelEquipBar, "PanelEquipBar"); + AddPanel(PanelType.PanelWeaponBar, "PanelWeaponBar"); AddPanel(PanelType.PanelTopSuffBar, "PanelTopSuffBar"); AddPanel(PanelType.PanelBossHpBar, "PanelBossHpBar"); } diff --git a/SurvivalTest/Assets/Scripts/Weapons.meta b/SurvivalTest/Assets/Scripts/Weapons.meta new file mode 100644 index 0000000..0cc5388 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09f9eba1fb9f9ac4aaf7bb4f335eb9f1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta new file mode 100644 index 0000000..1920297 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 253a4032920545c4488fd1eeedac07e3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs new file mode 100644 index 0000000..4db08ee --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LightSaber : 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/Weapons/LightSaber/LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta new file mode 100644 index 0000000..e8200d8 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/LightSaber.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 72f3d28485a45ba4b8906603b170f9fa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs new file mode 100644 index 0000000..ad942f3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs @@ -0,0 +1,63 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Weapon_LightSaber : WeaponBase +{ + public override string name => "¹â½£"; + + public override string iconPath => "art/ui/weaponicon/light_saber"; + + public override AutoMode autoMode => AutoMode.Condition; + + private string lightSaberPrefabPath = "prefabs/weapon/light_saber"; + + private bool isWielding = false; + + private LightSaber m_LightSaber; + + private TopDownTransform m_TopDownTransform; + + private float m_Dist = 0.2f; + + public override void OnInitialize(GameObject owner) + { + m_LightSaber = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(lightSaberPrefabPath)); + m_TopDownTransform = m_LightSaber.gameObject.GetComponent(); + SetLightSaberPositionAndRotation(owner.GetComponent()); + m_LightSaber.gameObject.SetActive(false); + } + + public override bool CheckCondition(GameObject owner) + { + return true; + } + + public override void OnTrigger(GameObject owner) + { + if (isWielding) + return; + isWielding = true; + + m_LightSaber.gameObject.SetActive(true); + } + + public override void OnStop(GameObject owner) + { + isWielding = false; + m_LightSaber.gameObject.SetActive(false); + } + + public override void Update(GameObject owner) + { + CrewScript crew = owner.GetComponent(); + SetLightSaberPositionAndRotation(crew); + } + + void SetLightSaberPositionAndRotation(CrewScript crew) + { + m_LightSaber.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * m_Dist; + m_LightSaber.transform.rotation = Quaternion.Euler(0, 0, Mathf.Atan2(crew.aimDirection.y, crew.aimDirection.x) * Mathf.Rad2Deg); + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta new file mode 100644 index 0000000..68db854 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/LightSaber/Weapon_LightSaber.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d419253b4eae555459a2800a7c95308c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta new file mode 100644 index 0000000..901bfca --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58852a4f6155748468fd8812fd61446d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs new file mode 100644 index 0000000..0ffb5eb --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/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/Weapons/RailGun/RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun/RailGun.cs.meta new file mode 100644 index 0000000..28040c3 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/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/Weapons/RailGun/Weapon_RailGun.cs b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs new file mode 100644 index 0000000..abad760 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Weapon_RailGun : WeaponBase +{ + 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/Weapons/RailGun/Weapon_RailGun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta new file mode 100644 index 0000000..8ecfcb4 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/RailGun/Weapon_RailGun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b319aeb6ad3ae5842bb716ffa24b898a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs new file mode 100644 index 0000000..d143199 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs @@ -0,0 +1,66 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public abstract class WeaponBase +{ + + public abstract string name { get; } + + public abstract string iconPath { get; } + + /// + /// Á¬·¢Ä£Ê½ + /// + public enum AutoMode + { + Interval, // °´Ê±Á¬·¢£¬ÐèÒªÉèÖÃInterval + Condition, // °´Ìõ¼þ´¥·¢£¬ÐèÒªÖØдCheckCondition + Always, // ³£×¤ + } + + public abstract AutoMode autoMode { get; } + + /// + /// ´¥·¢µÄʱ¼ä¼ä¸ô + /// + public virtual float interval { get; } + + /// + /// ³õʼ»¯ + /// + public virtual void OnInitialize(GameObject owner) + { + } + + /// + /// Ïú»Ù + /// + /// + public virtual void OnDestroy(GameObject owner) + { + } + + /// + /// ʹÓÃ×°±¸ + /// + public abstract void OnTrigger(GameObject owner); + + public virtual bool CheckCondition(GameObject owner) + { + return false; + } + + /// + /// Í£Ö¹¿ª»ð + /// + /// + public virtual void OnStop(GameObject owner) + { + } + + public virtual void Update(GameObject owner) + { + } + +} diff --git a/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta new file mode 100644 index 0000000..23e0a00 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/WeaponBase.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9ad03a26b4af7a42a81bd9216665ebb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs new file mode 100644 index 0000000..d701c83 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs @@ -0,0 +1,34 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// »ØÐýïÚ +/// +public class Weapon_Boomerang : WeaponBase +{ + public override AutoMode autoMode => AutoMode.Condition; + + public override string name => "»ØÐýïÚ"; + + public override string iconPath => "art/ui/weaponicon/boomerang"; + + /// + /// ½Óµ½»ØÐýïÚºóÖØÐÂÖÀ³ö£¬·ñÔò¼ä¸ôÒ»¶Îʱ¼äͶÖÀ + /// + /// + /// + public override bool CheckCondition(GameObject owner) + { + return false; + } + + public override void OnTrigger(GameObject owner) + { + } + + public override void Update(GameObject owner) + { + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta new file mode 100644 index 0000000..401fde6 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Boomerang.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1c95bca840a78e64bba70c9ecceb2628 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs new file mode 100644 index 0000000..3a4457a --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Áñµ¯·¢ÉäÆ÷ +/// +public class Weapon_GrenadeLauncher : WeaponBase +{ + + public override string name => "Áñµ¯·¢ÉäÆ÷"; + + public override string iconPath => "art/ui/weaponicon/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) + { + CrewScript crew = owner.GetComponent(); + + // grenade + TestPeaceMakerGrenade grenade = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load(prefabPath)); + Vector3 position = owner.GetComponent().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(ResourceManager.Instance.Load(vfxPath), crew.transform); + eff.transform.position = crew.launchPoint.position; + eff.SetActive(true); + + } +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta new file mode 100644 index 0000000..024da76 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_GrenadeLauncher.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dba5a0f9f2cde934e9a3c047eadfbf00 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs new file mode 100644 index 0000000..5517edd --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs @@ -0,0 +1,57 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// 枪 +/// +public class Weapon_Gun : WeaponBase +{ + + public override string name => "枪"; + + public override string iconPath => "art/ui/weaponicon/gun"; + + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 0.1f; + + private string prefabPath = "prefabs/bullet/bullet"; + + private int index = 0; + + TestPeaceMakerBullet CreateBullet(CrewScript crew, Vector2 dir, float speed, float lifeTime) + { + TestPeaceMakerBullet bullet = UnityEngine.Object.Instantiate(ResourceManager.Instance.Load< TestPeaceMakerBullet>(prefabPath)); + + bullet.transform.position = crew.arrow.position + new Vector3(crew.aimDirection.x, crew.aimDirection.y, 0) * -0.3f; + + bullet.Set(dir, speed, lifeTime); + bullet.gameObject.SetActive(true); + + return bullet; + } + + public override void OnTrigger(GameObject owner) + { + CrewScript crew = owner.GetComponent(); + + index++; + index = index % 3; + + if(index == 0) + { + CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, -10 * Mathf.Deg2Rad), 12f, 2f); + } + else if(index == 1) + { + CreateBullet(crew, crew.aimDirection, 12f, 2f); + } + else if(index == 2) + { + CreateBullet(crew, TestMathHelper.Rotate(crew.aimDirection, 10 * Mathf.Deg2Rad), 12f, 2f); + } + + } + +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta new file mode 100644 index 0000000..5aeaa24 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_Gun.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a5f1ba1ce3c9824f9dd23e7a47458e8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs new file mode 100644 index 0000000..3253f33 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// ³¬·²ÊÖÌ×£¬¼¯ÆëÎå¿Å±¦Ê¯ÊÎÆ·½âËø³¬Îä +/// +public class Weapon_MightyGlove : WeaponBase +{ + + public override string name => "³¬·²ÊÖÌ×"; + + public override string iconPath => "art/ui/weaponicon/glove"; + + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 100f; + + public override void OnTrigger(GameObject owner) + { + } +} \ No newline at end of file diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta new file mode 100644 index 0000000..b0c414f --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_MightyGlove.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d9fff60e7cb47d545bef9de999f5a0f0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs new file mode 100644 index 0000000..1a6e448 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// ÌØ˹À­ÏßȦ +/// +public class Weapon_TeslaCoil : WeaponBase +{ + + public override string name => "ÌØ˹À­ÏßȦ"; + + public override string iconPath => "art/ui/weaponicon/tesla_coil"; + + public override AutoMode autoMode => AutoMode.Interval; + + public override float interval => 20f; + + public override void OnTrigger(GameObject owner) + { + } + +} diff --git a/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta new file mode 100644 index 0000000..5a30a14 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Weapons/Weapon_TeslaCoil.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 482fe3c5e222fbe4b82527cd796989db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- cgit v1.1-26-g67d0