From 9a0d54ee76591655253227e192c194fa754f4a2d Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Mon, 3 Jan 2022 00:41:09 +0300 Subject: [PATCH] new main menu --- Assets/EquipmentView.cs | 18 + Assets/EquipmentView.cs.meta | 11 + Assets/HighLightButton.cs | 36 + Assets/HighLightButton.cs.meta | 11 + Assets/Prefab/CardSlot.prefab | 780 + Assets/Prefab/CardSlot.prefab.meta | 7 + Assets/Prefab/Weapon.prefab | 2553 ++ Assets/Prefab/Weapon.prefab.meta | 7 + Assets/Prefab/WeaponIcons.meta | 8 + Assets/Prefab/WeaponIcons/LaserIcon.prefab | 229 + .../Prefab/WeaponIcons/LaserIcon.prefab.meta | 7 + Assets/Prefab/WeaponIcons/StandartIcon.prefab | 77 + .../WeaponIcons/StandartIcon.prefab.meta | 7 + .../Animation/Tool_Bar/Shop.controller | 2 +- Assets/Resources/Data/GameMenuData.asset | 4 +- Assets/Resources/Data/WeaponsData.asset | 6 +- Assets/Scenes/MainMenu.unity | 4 +- Assets/Scenes/NewMainMenu.unity | 23433 +++++++++++++--- Assets/Scenes/_MainMenu.unity | 963 +- Assets/Scripts/MainMenu/AudioSettings.cs | 8 +- Assets/Scripts/MainMenu/GameMenuData.cs | 4 +- Assets/Scripts/MainMenu/SettingsController.cs | 65 +- Assets/Scripts/MusicController.cs | 4 +- Assets/Scripts/Weapons/Weapon.cs | 3 +- Assets/ToolBarController.cs | 66 +- Assets/WeaponIcon.cs | 6 + Assets/WeaponSelection.cs | 6 +- ProjectSettings/EditorBuildSettings.asset | 7 +- 28 files changed, 22985 insertions(+), 5347 deletions(-) create mode 100644 Assets/EquipmentView.cs create mode 100644 Assets/EquipmentView.cs.meta create mode 100644 Assets/HighLightButton.cs create mode 100644 Assets/HighLightButton.cs.meta create mode 100644 Assets/Prefab/CardSlot.prefab create mode 100644 Assets/Prefab/CardSlot.prefab.meta create mode 100644 Assets/Prefab/Weapon.prefab create mode 100644 Assets/Prefab/Weapon.prefab.meta create mode 100644 Assets/Prefab/WeaponIcons.meta create mode 100644 Assets/Prefab/WeaponIcons/LaserIcon.prefab create mode 100644 Assets/Prefab/WeaponIcons/LaserIcon.prefab.meta create mode 100644 Assets/Prefab/WeaponIcons/StandartIcon.prefab create mode 100644 Assets/Prefab/WeaponIcons/StandartIcon.prefab.meta diff --git a/Assets/EquipmentView.cs b/Assets/EquipmentView.cs new file mode 100644 index 00000000..2859e3bf --- /dev/null +++ b/Assets/EquipmentView.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EquipmentView : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/EquipmentView.cs.meta b/Assets/EquipmentView.cs.meta new file mode 100644 index 00000000..56b5d2aa --- /dev/null +++ b/Assets/EquipmentView.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 025f440838f42a14e87db46c2360aaad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HighLightButton.cs b/Assets/HighLightButton.cs new file mode 100644 index 00000000..f71a09d9 --- /dev/null +++ b/Assets/HighLightButton.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using DG.Tweening; +using UnityEngine; +using UnityEngine.UI; + +public class HighLightButton : MonoBehaviour +{ + [SerializeField] private GameObject highLighter; + [SerializeField] private List