From def871faed2a6c28477c81d9c817457e18348085 Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Mon, 3 Jan 2022 18:47:13 +0300 Subject: [PATCH] fixes. chosen weapon status --- Assets/ChosenWeapon.cs | 30 ++++++++++++++++++++++++++++++ Assets/ChosenWeapon.cs.meta | 11 +++++++++++ Assets/Scenes/NewMainMenu.unity | 2 +- Assets/WeaponSelection.cs | 7 +++++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 Assets/ChosenWeapon.cs create mode 100644 Assets/ChosenWeapon.cs.meta diff --git a/Assets/ChosenWeapon.cs b/Assets/ChosenWeapon.cs new file mode 100644 index 00000000..46236e64 --- /dev/null +++ b/Assets/ChosenWeapon.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using TMPro; +using UnityEngine; +using Weapons; + +public class ChosenWeapon : MonoBehaviour +{ + [SerializeField] private TMP_Text attackText; + [SerializeField] private TMP_Text reloadText; + [SerializeField] private string chosenWeaponDataPath; + + private Weapon Weapon => + JsonUtility.FromJson(File.ReadAllText(Application.persistentDataPath + "/" + chosenWeaponDataPath)); + + private void Start() + { + attackText.text = Weapon.damage.ToString(); + reloadText.text = Weapon.reloadTime.ToString(CultureInfo.CurrentCulture); + } + + public void ChangeChosenWeapon(Weapon weapon) + { + attackText.text = weapon.damage.ToString(); + reloadText.text = weapon.reloadTime.ToString(CultureInfo.CurrentCulture); + } +} \ No newline at end of file diff --git a/Assets/ChosenWeapon.cs.meta b/Assets/ChosenWeapon.cs.meta new file mode 100644 index 00000000..ecd6a459 --- /dev/null +++ b/Assets/ChosenWeapon.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a2920b048f18f5946b93c003a602952b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/NewMainMenu.unity b/Assets/Scenes/NewMainMenu.unity index 9e0990ab..1045a4b3 100644 --- a/Assets/Scenes/NewMainMenu.unity +++ b/Assets/Scenes/NewMainMenu.unity @@ -88770,7 +88770,7 @@ MonoBehaviour: m_EditorClassIdentifier: menuMusSrc: {fileID: 579284492} GameData: {fileID: 11400000, guid: 4828646b64dadac47a63b0be91a92517, type: 2} - dataFilePath: AduioSettings + dataFilePath: AudioSettings.json musicSlider: {fileID: 1813936035} sfxSlider: {fileID: 597565998} musicImage: {fileID: 1040137649} diff --git a/Assets/WeaponSelection.cs b/Assets/WeaponSelection.cs index c465a64b..3c0810fe 100644 --- a/Assets/WeaponSelection.cs +++ b/Assets/WeaponSelection.cs @@ -1,7 +1,9 @@ +using System; using System.Collections.Generic; using System.IO; using DefaultNamespace.Weapons; using UnityEngine; +using UnityEngine.Events; using UnityEngine.UI; using Weapons; @@ -11,6 +13,8 @@ public class WeaponSelection : MonoBehaviour [SerializeField] private WeaponIcon weaponIcon; [SerializeField] private Transform grid; [SerializeField] private string dataFilePath; + [SerializeField] private ChosenWeapon chosenWeapon; + private Action changeStats; private List