From e2017dc339f98626f6919eb837dd558c48035d46 Mon Sep 17 00:00:00 2001 From: dddushesss <37773701+dddushesss@users.noreply.github.com> Date: Mon, 24 Jan 2022 05:31:26 +0300 Subject: [PATCH 1/4] changed spawn logic. fixed inventory --- Assets/Joystick Pack/Scripts/Base/Joystick.cs | 6 +- .../Resources/1/Crystal/Prefab/Crystal.prefab | 195 ++++++------------ Assets/Scenes/Level 1.unity | 97 +++++++++ Assets/Scripts/ADs/AdsMob.cs | 16 +- Assets/Scripts/AI/AIAgent.cs | 2 +- Assets/Scripts/AI/AIManager.cs | 7 +- Assets/Scripts/Controller/GameInit.cs | 49 +---- Assets/Scripts/Data/Data.cs | 4 +- Assets/Scripts/GameUI/PlayerInventoryView.cs | 16 +- Assets/Scripts/HexFiled/HexCell.cs | 4 +- Assets/Scripts/HexFiled/HexGrid.cs | 18 +- Assets/Scripts/HexFiled/PaintedController.cs | 18 +- Assets/Scripts/Items/CaptureAbility.cs | 2 +- Assets/Scripts/Items/ItemViews/ItemView.cs | 4 +- Assets/Scripts/Items/ItemViews/TowerView.cs | 12 +- Assets/Scripts/MainMenu/AudioSettings.cs | 6 +- Assets/Scripts/MainMenu/EquipmentView.cs | 18 -- Assets/Scripts/MainMenu/EquipmentView.cs.meta | 11 - Assets/Scripts/MainMenu/FadeIn.cs | 3 +- Assets/Scripts/MainMenu/GameMenuData.cs | 11 - Assets/Scripts/MainMenu/GameMenuData.cs.meta | 3 - Assets/Scripts/MainMenu/SettingsController.cs | 9 +- Assets/Scripts/MainMenu/WeaponSelection.cs | 1 + Assets/Scripts/MusicController.cs | 4 +- Assets/Scripts/Units/EnemyController.cs | 39 ---- Assets/Scripts/Units/EnemyController.cs.meta | 3 - Assets/Scripts/Units/PlayerControl.cs | 36 ++-- Assets/Scripts/Units/Unit.cs | 8 +- Assets/Scripts/Units/UnitFactory.cs | 71 ++++++- Assets/Scripts/Units/Views/UnitView.cs | 3 +- 30 files changed, 339 insertions(+), 337 deletions(-) delete mode 100644 Assets/Scripts/MainMenu/EquipmentView.cs delete mode 100644 Assets/Scripts/MainMenu/EquipmentView.cs.meta delete mode 100644 Assets/Scripts/MainMenu/GameMenuData.cs delete mode 100644 Assets/Scripts/MainMenu/GameMenuData.cs.meta delete mode 100644 Assets/Scripts/Units/EnemyController.cs delete mode 100644 Assets/Scripts/Units/EnemyController.cs.meta diff --git a/Assets/Joystick Pack/Scripts/Base/Joystick.cs b/Assets/Joystick Pack/Scripts/Base/Joystick.cs index 5d50584c..3cc9eee4 100644 --- a/Assets/Joystick Pack/Scripts/Base/Joystick.cs +++ b/Assets/Joystick Pack/Scripts/Base/Joystick.cs @@ -34,9 +34,9 @@ public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoint [SerializeField] private RectTransform handle = null; private RectTransform baseRect = null; - public Action OnTouchUp; - public Action OnTouchDown; - public Action OnDrug; + public event Action OnTouchUp; + public event Action OnTouchDown; + public event Action OnDrug; private Canvas canvas; private Camera cam; diff --git a/Assets/Resources/1/Crystal/Prefab/Crystal.prefab b/Assets/Resources/1/Crystal/Prefab/Crystal.prefab index 116ffd9a..36aae939 100644 --- a/Assets/Resources/1/Crystal/Prefab/Crystal.prefab +++ b/Assets/Resources/1/Crystal/Prefab/Crystal.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 3496656575117217171} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.4285715, y: 1.2420664, z: 1.4285715} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1659083691731649603} - {fileID: 830850053889082325} @@ -50,10 +50,8 @@ MonoBehaviour: weapon: name: TowerWeapon icon: {fileID: 0} - objectToThrow: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98, - type: 3} - VFXGameObject: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889, - type: 3} + objectToThrow: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98, type: 3} + VFXGameObject: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889, type: 3} modifiedDamage: 0 damage: 50 speed: 1 @@ -62,7 +60,6 @@ MonoBehaviour: shots: 4 shotSound: {fileID: 8300000, guid: 9ea918c6c23577f4e885a8490d2f2046, type: 3} hitSound: {fileID: 8300000, guid: 6c42231c18643dc4d9d8f8d15bc4735b, type: 3} - _meshRenderer: {fileID: 5679516902409568551} crystals: - _gameObject: {fileID: 2039549536233283321} _unitColor: 4 @@ -79,68 +76,55 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4576729921189221636} m_Modifications: - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalPosition.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4391758782632602575, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4391758782632602575, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_Name value: CrystaRed objectReference: {fileID: 0} - - target: {fileID: 4391758782632602575, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + - target: {fileID: 4391758782632602575, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -148,14 +132,12 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} --- !u!1 &1928478559685501253 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 4391758782632602575, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + m_CorrespondingSourceObject: {fileID: 4391758782632602575, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} m_PrefabInstance: {fileID: 2752258269723904650} m_PrefabAsset: {fileID: 0} --- !u!4 &1263406638282488831 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, - type: 3} + m_CorrespondingSourceObject: {fileID: 4015374634755354997, guid: 2d04fd15863f13c4487d158f78e2a362, type: 3} m_PrefabInstance: {fileID: 2752258269723904650} m_PrefabAsset: {fileID: 0} --- !u!1001 &6075215457166424256 @@ -165,68 +147,55 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4576729921189221636} m_Modifications: - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalPosition.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1128494808968600640, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 1128494808968600640, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_Name value: CrystaYellow objectReference: {fileID: 0} - - target: {fileID: 1128494808968600640, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + - target: {fileID: 1128494808968600640, guid: 502fb68ff9e389e479f59c576782150a, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -234,14 +203,12 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 502fb68ff9e389e479f59c576782150a, type: 3} --- !u!1 &6622182927934416000 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 1128494808968600640, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + m_CorrespondingSourceObject: {fileID: 1128494808968600640, guid: 502fb68ff9e389e479f59c576782150a, type: 3} m_PrefabInstance: {fileID: 6075215457166424256} m_PrefabAsset: {fileID: 0} --- !u!4 &5813418027225431610 stripped Transform: - m_CorrespondingSourceObject: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, - type: 3} + m_CorrespondingSourceObject: {fileID: 352099495347111674, guid: 502fb68ff9e389e479f59c576782150a, type: 3} m_PrefabInstance: {fileID: 6075215457166424256} m_PrefabAsset: {fileID: 0} --- !u!1001 &7947451719248451575 @@ -251,68 +218,55 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4576729921189221636} m_Modifications: - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalPosition.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7964352262128733848, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7964352262128733848, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_Name value: CrystaGreen objectReference: {fileID: 0} - - target: {fileID: 7964352262128733848, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + - target: {fileID: 7964352262128733848, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -320,20 +274,12 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} --- !u!1 &57444072119081327 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7964352262128733848, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + m_CorrespondingSourceObject: {fileID: 7964352262128733848, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} m_PrefabInstance: {fileID: 7947451719248451575} m_PrefabAsset: {fileID: 0} --- !u!4 &830850053889082325 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} - m_PrefabInstance: {fileID: 7947451719248451575} - m_PrefabAsset: {fileID: 0} ---- !u!137 &5679516902409568551 stripped -SkinnedMeshRenderer: - m_CorrespondingSourceObject: {fileID: 2349392135937857232, guid: 54e3bec084dedc847a62e362e0d63332, - type: 3} + m_CorrespondingSourceObject: {fileID: 7335449565726987298, guid: 54e3bec084dedc847a62e362e0d63332, type: 3} m_PrefabInstance: {fileID: 7947451719248451575} m_PrefabAsset: {fileID: 0} --- !u!1001 &8308599901968557183 @@ -343,68 +289,55 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4576729921189221636} m_Modifications: - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalPosition.y value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7999515437598587526, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7999515437598587526, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_Name value: CrystaBlue objectReference: {fileID: 0} - - target: {fileID: 7999515437598587526, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + - target: {fileID: 7999515437598587526, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -412,13 +345,11 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} --- !u!1 &2039549536233283321 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 7999515437598587526, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + m_CorrespondingSourceObject: {fileID: 7999515437598587526, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} m_PrefabInstance: {fileID: 8308599901968557183} m_PrefabAsset: {fileID: 0} --- !u!4 &1659083691731649603 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, - type: 3} + m_CorrespondingSourceObject: {fileID: 7226074276374339644, guid: 48b919cb81c94d846ab3491c856224ab, type: 3} m_PrefabInstance: {fileID: 8308599901968557183} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 396fa715..8d072227 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -337,6 +337,7 @@ GameObject: - component: {fileID: 1455205766} - component: {fileID: 1455205765} - component: {fileID: 1455205764} + - component: {fileID: 1455205767} m_Layer: 5 m_Name: Score m_TagString: Untagged @@ -472,6 +473,102 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1455205762} m_CullTransparentMesh: 1 +--- !u!82 &1455205767 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1455205762} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &1475618468 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ADs/AdsMob.cs b/Assets/Scripts/ADs/AdsMob.cs index 6084ed78..e90f44d8 100644 --- a/Assets/Scripts/ADs/AdsMob.cs +++ b/Assets/Scripts/ADs/AdsMob.cs @@ -1,5 +1,7 @@ using System.Collections.Generic; using System.Timers; +using Chars; +using Data; using UnityEngine; // using GoogleMobileAds.Api; using HexFiled; @@ -12,7 +14,8 @@ public class AdsMob : MonoBehaviour // private string _revardUnitId = "ca-app-pub-3940256099942544/5224354917"; // private RewardedAd _ad; // private AdRequest _request; - private Unit _player; + private UnitInfo _player; + private UnitFactory _factory; [SerializeField] private Button button; [SerializeField] private GameObject canvas; @@ -40,7 +43,13 @@ public class AdsMob : MonoBehaviour private void Spawn() { - _player.Spawn(HexManager.CellByColor[UnitColor.GREY][Random.Range(0, HexManager.CellByColor[UnitColor.GREY].Count - 1)].coordinates); + var player = _player; + player.spawnPos = + HexManager.CellByColor[UnitColor.GREY][Random.Range(0, HexManager.CellByColor[UnitColor.GREY].Count - 1)] + .coordinates; + + _factory.Spawn(player); + canvas.SetActive(false); Time.timeScale = 1f; } @@ -54,8 +63,9 @@ public class AdsMob : MonoBehaviour // } // } - public void ShowCanvas(Unit player) + public void ShowCanvas(UnitInfo player, UnitFactory factory) { + _factory = factory; _player = player; Time.timeScale = 0f; canvas.SetActive(true); diff --git a/Assets/Scripts/AI/AIAgent.cs b/Assets/Scripts/AI/AIAgent.cs index 1aed2fb3..ba5771ee 100644 --- a/Assets/Scripts/AI/AIAgent.cs +++ b/Assets/Scripts/AI/AIAgent.cs @@ -30,7 +30,7 @@ namespace DefaultNamespace.AI _unit = unit; _camera = Camera.main; _unit.OnDeath += AgentDeath; - unit.onPlayerSpawned += InitAgent; + unit.OnPlayerSpawned += InitAgent; } diff --git a/Assets/Scripts/AI/AIManager.cs b/Assets/Scripts/AI/AIManager.cs index 3c398469..59d3ac22 100644 --- a/Assets/Scripts/AI/AIManager.cs +++ b/Assets/Scripts/AI/AIManager.cs @@ -70,7 +70,7 @@ namespace AI foreach (var color in (UnitColor[])Enum.GetValues(typeof(UnitColor))) { if (HexManager.UnitCurrentCell.ContainsKey(color) && - HexManager.UnitCurrentCell[color] != (null, null) && + HexManager.UnitCurrentCell[color] != (null, null) && Vector3.Distance(HexManager.UnitCurrentCell[color].unit.Instance.transform.position, agent.Instance.transform.position) <= cellDist * HexGrid.HexDistance && HexManager.UnitCurrentCell[color].unit.Color != agent.Color) @@ -224,8 +224,9 @@ namespace AI private void MoveToBonus(AIAgent agent) { - Pathfinding.FindPath(HexManager.UnitCurrentCell[agent.Unit.Color].cell, GetNearestItem(agent).hex, - agent.currentPath); + if (HexManager.UnitCurrentCell.TryGetValue(agent.Unit.Color, out var value)) + Pathfinding.FindPath(value.cell, GetNearestItem(agent).hex, + agent.currentPath); } private void AttackEnemy(AIAgent agent) diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index 3b792791..857e0817 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -23,7 +23,7 @@ namespace Controller new MusicController(); new VFXController(); MusicController.Instance.SetMusicData(data.MusicData); - controllers.Add(hexGrid); + var paintedController = new PaintedController(); data.WeaponsData.WeaponsList.ForEach(x => x.SetModifiedDamage(0)); @@ -33,55 +33,16 @@ namespace Controller UIController uiController = new UIController(data.UIData); uiController.Spawn(); //TODO при паузе Dotween ругается - Unit player; - List units = new List(); - data.UnitData.Units.ForEach(unit => - { - if (unit.isPlayer) - { - var weapon = JsonUtility.FromJson(data.ChosenWeapon); - weapon.SetModifiedDamage(0); + - player = new Unit(unit, weapon, hexGrid); - PlayerControl playerControl = new PlayerControl(player, uiController.PlayerControlView, - uiController.PlayerInventoryView); - controllers.Add(playerControl); - CameraControl cameraControl = - new CameraControl(Camera.main, data.CameraData); - controllers.Add(cameraControl); + var unitFactory = new UnitFactory(hexGrid, data, uiController, paintedController, controllers); - player.onPlayerSpawned += p => controllers.Add(playerControl); - - player.OnDeath += unit1 => controllers.Remove(playerControl); - - player.onPlayerSpawned += cameraControl.InitCameraControl; - units.Add(player); - - player.OnDeath += uiController.AdsMob.ShowCanvas; - player.OnDeath += paintedController.PaintOnDeath; - } - else - { - var enemy = new Unit(unit, - data.WeaponsData.WeaponsList[Random.Range(0, data.WeaponsData.WeaponsList.Count - 1)], hexGrid); - var enemyController = new EnemyController(unit, enemy); - controllers.Add(enemyController); - units.Add(enemy); - AIAgent agent = new AIAgent(unit, enemy); - enemy.onPlayerSpawned += x => controllers.Add(agent); - enemy.OnDeath += x => { controllers.Remove(agent); }; - enemy.OnDeath += paintedController.PaintOnDeath; - } - - }); - - var unitFactory = new UnitFactory(units, hexGrid); - - hexGrid.OnGridLoaded += unitFactory.Spawn; + hexGrid.OnGridLoaded += () => unitFactory.SpawnList(data.UnitData.Units); hexGrid.OnHexPainted += paintedController.SetHexColors; hexGrid.OnHexPainted += itemFabric.UpdateCellToOpenList; hexGrid.OnHexPainted += paintedController.CheckDeathOrDestroy; + hexGrid.SpawnField(); } } diff --git a/Assets/Scripts/Data/Data.cs b/Assets/Scripts/Data/Data.cs index 7fadba08..16352047 100644 --- a/Assets/Scripts/Data/Data.cs +++ b/Assets/Scripts/Data/Data.cs @@ -2,6 +2,7 @@ using Chars; using DefaultNamespace.Weapons; using UnityEngine; +using Weapons; namespace Data { @@ -26,7 +27,8 @@ namespace Data private AIData _aiData; [SerializeField] private string chosenWeaponDataPath; - public string ChosenWeapon => File.ReadAllText(Application.persistentDataPath + "/" + chosenWeaponDataPath); + public Weapon ChosenWeapon => + JsonUtility.FromJson(File.ReadAllText(Application.persistentDataPath + "/" + chosenWeaponDataPath)); public AIData AIData { diff --git a/Assets/Scripts/GameUI/PlayerInventoryView.cs b/Assets/Scripts/GameUI/PlayerInventoryView.cs index 3c618a23..48aaca6b 100644 --- a/Assets/Scripts/GameUI/PlayerInventoryView.cs +++ b/Assets/Scripts/GameUI/PlayerInventoryView.cs @@ -11,9 +11,9 @@ namespace GameUI [SerializeField] private GameObject item; [SerializeField] private GameObject grid; - public Action OnBuildingInvoked; - + public event Action OnBuildingInvoked; + private List itemsGo; private List