diff options
Diffstat (limited to 'SurvivalTest/Assets/Scripts')
4 files changed, 37 insertions, 3 deletions
diff --git a/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs new file mode 100644 index 0000000..08cd3a1 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; + +public static class EditorTools +{ + + [MenuItem("Tools/³¡¾°/²âÊÔ³¡¾° _F5")] + public static void OpenDemoScene() + { + UnityEditor.SceneManagement.EditorSceneManager.OpenScene("Assets/Resources/scenes/Demo.unity"); + } + + [MenuItem("Tools/³¡¾°/UI±à¼³¡¾° _F6")] + public static void OpenUIEditScene() + { + UnityEditor.SceneManagement.EditorSceneManager.OpenScene("Assets/Scenes/UIEditScene.unity"); + } + +} diff --git a/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs.meta b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs.meta new file mode 100644 index 0000000..68fdbd5 --- /dev/null +++ b/SurvivalTest/Assets/Scripts/Editor/EditorTools.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 34f820b4942ac434ba11b6bbc5561d51 +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 index 0ec7dc9..cd020a0 100644 --- a/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs +++ b/SurvivalTest/Assets/Scripts/Equips/Equip_GrenadeLauncher.cs @@ -34,13 +34,13 @@ public class Equip_GrenadeLauncher : EquipBase { CrewScript crew = owner.GetComponent<CrewScript>(); - //// grenade + // 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 + // vfx GameObject eff = UnityEngine.Object.Instantiate<GameObject>(ResourceManager.Instance.Load<UnityEngine.GameObject>(vfxPath), crew.transform); eff.transform.position = crew.launchPoint.position; eff.SetActive(true); diff --git a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs index 1a7dae8..03ee945 100644 --- a/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs +++ b/SurvivalTest/Assets/Scripts/UI/Panel/PanelEquipBar/PanelEquipBar.cs @@ -12,7 +12,9 @@ public class PanelEquipBar : PanelBase public override void Set(object param) { - for(int i = 0; i < PlayerManager.Instance.equips.Count; ++i) + 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); |