From 020dbc4be6ab5dda40446951799a604d37dc18dc Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Thu, 24 Feb 2022 14:55:55 +0300 Subject: [PATCH] fixed Rocket --- .../Sirenix/GlobalSerializationConfig.asset | 2 +- .../1/VFX/Bonus/Attack/Rocket/Rocket.prefab | 10 +- Assets/Scenes/MainMenu.unity | 2 +- Assets/Scripts/Items/ItemViews/RocketView.cs | 27 ++-- Assets/Scripts/Items/SpecialWeapon.cs | 4 +- Assets/Scripts/MainMenu/ChosenWeapon.cs | 40 +++--- Assets/Scripts/MainMenu/FadeIn.cs | 18 +-- Assets/Scripts/MainMenu/HighLightButton.cs | 36 ----- .../Scripts/MainMenu/HighLightButton.cs.meta | 11 -- Assets/Scripts/MainMenu/LevelData.cs | 29 ++-- Assets/Scripts/MainMenu/SettingsController.cs | 126 +++++++++--------- Assets/Scripts/MainMenu/ToolBarController.cs | 72 +++++----- Assets/Scripts/MainMenu/WeaponIcon.cs | 31 ++--- Assets/Scripts/MainMenu/WeaponSelection.cs | 83 ++++++------ Assets/Scripts/Weapons/Weapon.cs | 40 +++--- .../Android_2022_02_22_05_17_01.ahbuildinfo | 1 + 16 files changed, 247 insertions(+), 285 deletions(-) delete mode 100644 Assets/Scripts/MainMenu/HighLightButton.cs delete mode 100644 Assets/Scripts/MainMenu/HighLightButton.cs.meta create mode 100644 SerializedBuildInfo/Android_2022_02_22_05_17_01.ahbuildinfo diff --git a/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset index 185befc6..979e72e9 100644 --- a/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset +++ b/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: GlobalSerializationConfig m_EditorClassIdentifier: HideSerializationCautionaryMessage: 1 - HidePrefabCautionaryMessage: 0 + HidePrefabCautionaryMessage: 1 HideOdinSerializeAttributeWarningMessages: 0 HideNonSerializedShowInInspectorWarningMessages: 0 buildSerializationFormat: 0 diff --git a/Assets/Resources/1/VFX/Bonus/Attack/Rocket/Rocket.prefab b/Assets/Resources/1/VFX/Bonus/Attack/Rocket/Rocket.prefab index b1b94009..0676e0bf 100644 --- a/Assets/Resources/1/VFX/Bonus/Attack/Rocket/Rocket.prefab +++ b/Assets/Resources/1/VFX/Bonus/Attack/Rocket/Rocket.prefab @@ -25,8 +25,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 662838864788327244} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0, y: 0.9985128, z: 0, w: 0.054518197} + m_LocalPosition: {x: 20.317627, y: 0, z: 57.78} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8618016098659616984} @@ -136,8 +136,8 @@ MonoBehaviour: Entry: 8 Data: _unit: {fileID: 0} - _color: 0 - speed: 0.1 + _color: 3 + speed: 0.3 --- !u!136 &7385595456525671967 CapsuleCollider: m_ObjectHideFlags: 0 @@ -280,7 +280,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7418914791400950115, guid: 13431d38aaa99b8409a3e1ef301152d7, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 13431d38aaa99b8409a3e1ef301152d7, type: 3} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index cfff4e2c..ef87c62f 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -130526,7 +130526,7 @@ MonoBehaviour: attackText: {fileID: 1033038899} reloadText: {fileID: 985521934} chosenWeaponDataPath: ChosenWeapon.json - _data: {fileID: 0} + _data: {fileID: 11400000, guid: 933ff56c36f8e2048ac179b755c821f7, type: 2} --- !u!1 &1550290323 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Items/ItemViews/RocketView.cs b/Assets/Scripts/Items/ItemViews/RocketView.cs index 3c8b74e3..83db4b9a 100644 --- a/Assets/Scripts/Items/ItemViews/RocketView.cs +++ b/Assets/Scripts/Items/ItemViews/RocketView.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; using AI; +using DefaultNamespace; using DG.Tweening; using HexFiled; using Sirenix.OdinInspector; @@ -23,11 +24,22 @@ namespace Items.ItemViews { _unit = unit.Instance; _color = unit.Color; + Rockets[_color].SetActive(true); + GetNearestUnit(); + MoveToTarget(); + } + private void MoveToTarget() + { + transform.DOKill(); + transform.LookAt(listUnits.First().transform); + transform.DOMove(listUnits.First().transform.position, + speed * Vector3.Distance(transform.position, listUnits.First().transform.position)).OnUpdate( + MoveToTarget); + } private void GetNearestUnit() { - Rockets[_color].SetActive(true); listUnits = new List(); listUnits.AddRange(HexManager.UnitCurrentCell.Where(x => x.Key != _color).ToList() .Select(x => x.Value.unit.Instance)); @@ -36,17 +48,6 @@ namespace Items.ItemViews Vector3.Distance(y.transform.position, _unit.transform.position))); } - private void Update() - { - if (_unit != null) - { - GetNearestUnit(); - transform.DOKill(); - transform.LookAt(listUnits.First().transform); - transform.DOMove(listUnits.First().transform.position, - Vector3.Distance(listUnits.First().transform.position, _unit.transform.position) * speed) - .SetEase(Ease.Linear); - } - } + } } \ No newline at end of file diff --git a/Assets/Scripts/Items/SpecialWeapon.cs b/Assets/Scripts/Items/SpecialWeapon.cs index 48a88fd1..8876c54e 100644 --- a/Assets/Scripts/Items/SpecialWeapon.cs +++ b/Assets/Scripts/Items/SpecialWeapon.cs @@ -46,12 +46,12 @@ namespace Items container.Unit.RotateUnit(container.Direction); _weapon.SetModifiedDamage(0); - _weapon.objectToThrow.GetComponent().SetUp(container.Unit); container.DeAim(); TimerHelper.Instance.StartTimer(() => { - var ball = _weapon.Fire(container.Unit.Instance.transform, container.Direction, container.Unit); + var ball = _weapon.Fire(container.Unit.Instance.transform, container.Direction, container.Unit, false); + ball.GetComponent().SetUp(container.Unit); if (isLifeByTime) { TimerHelper.Instance.StartTimer(() => diff --git a/Assets/Scripts/MainMenu/ChosenWeapon.cs b/Assets/Scripts/MainMenu/ChosenWeapon.cs index 8e4e0ba9..7fe5027a 100644 --- a/Assets/Scripts/MainMenu/ChosenWeapon.cs +++ b/Assets/Scripts/MainMenu/ChosenWeapon.cs @@ -1,6 +1,3 @@ -using System; -using System.Collections; -using System.Collections.Generic; using System.Globalization; using System.IO; using Data; @@ -8,25 +5,28 @@ using TMPro; using UnityEngine; using Weapons; -public class ChosenWeapon : MonoBehaviour +namespace MainMenu { - [SerializeField] private TMP_Text attackText; - [SerializeField] private TMP_Text reloadText; - [SerializeField] private string chosenWeaponDataPath; - [SerializeField] private WeaponsData _data; - - private Weapon Weapon => - _data.WeaponsList[int.Parse(File.ReadAllText(Application.persistentDataPath + "/" + chosenWeaponDataPath))]; - - private void Start() + public class ChosenWeapon : MonoBehaviour { - attackText.text = Weapon.damage.ToString(); - reloadText.text = Weapon.reloadTime.ToString(CultureInfo.CurrentCulture); - } + [SerializeField] private TMP_Text attackText; + [SerializeField] private TMP_Text reloadText; + [SerializeField] private string chosenWeaponDataPath; + [SerializeField] private WeaponsData _data; - public void ChangeChosenWeapon(Weapon weapon) - { - attackText.text = weapon.damage.ToString(); - reloadText.text = weapon.reloadTime.ToString(CultureInfo.CurrentCulture); + private Weapon Weapon => + _data.WeaponsList[int.Parse(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/Scripts/MainMenu/FadeIn.cs b/Assets/Scripts/MainMenu/FadeIn.cs index 69409246..4ec9d868 100644 --- a/Assets/Scripts/MainMenu/FadeIn.cs +++ b/Assets/Scripts/MainMenu/FadeIn.cs @@ -1,18 +1,18 @@ -using System; -using System.Collections; -using System.Collections.Generic; using DG.Tweening; using UnityEngine; using UnityEngine.UI; -public class FadeIn : MonoBehaviour +namespace MainMenu { - [SerializeField] private float duration; + public class FadeIn : MonoBehaviour + { + [SerializeField] private float duration; - private void Start() - { - var back = GetComponent(); - back.DOFade(0, duration).OnComplete(() => gameObject.SetActive(false)); + private void Start() + { + var back = GetComponent(); + back.DOFade(0, duration).OnComplete(() => gameObject.SetActive(false)); + } } } diff --git a/Assets/Scripts/MainMenu/HighLightButton.cs b/Assets/Scripts/MainMenu/HighLightButton.cs deleted file mode 100644 index f71a09d9..00000000 --- a/Assets/Scripts/MainMenu/HighLightButton.cs +++ /dev/null @@ -1,36 +0,0 @@ -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