From a1d79f326c1a33c0bd4a8ea4c7454db66152c156 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 30 Jun 2025 03:41:44 -0400 Subject: [PATCH 1/4] mill implemented --- Assets/Design/UnitCards/Mill.asset | 4 +- Assets/Prefabs/Buildings/Mill.prefab | 84 ++++++++++++++++++- Assets/Scenes/Game.unity | 82 ++++++++++-------- Assets/Scripts/Ally/House.cs | 2 +- Assets/Scripts/Ally/Mill.cs | 6 ++ Assets/Scripts/Ally/Mill.cs.meta | 11 +++ Assets/Scripts/Ally/ProductionBuilding.cs | 45 ++++++++++ .../Scripts/Ally/ProductionBuilding.cs.meta | 11 +++ Assets/Scripts/General/GlobalConfigFile.cs | 1 + Assets/Scripts/Tiles/ResourceTile.cs | 18 +++- 10 files changed, 216 insertions(+), 48 deletions(-) create mode 100644 Assets/Scripts/Ally/Mill.cs create mode 100644 Assets/Scripts/Ally/Mill.cs.meta create mode 100644 Assets/Scripts/Ally/ProductionBuilding.cs create mode 100644 Assets/Scripts/Ally/ProductionBuilding.cs.meta diff --git a/Assets/Design/UnitCards/Mill.asset b/Assets/Design/UnitCards/Mill.asset index dcbdb34..984ae91 100644 --- a/Assets/Design/UnitCards/Mill.asset +++ b/Assets/Design/UnitCards/Mill.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a92d696df7037b44585aaac56ec9ed98, type: 3} m_Name: Mill m_EditorClassIdentifier: - _wood: 80 + _wood: 10 _rock: 0 _food: 0 - _cooldownInSeconds: 30 + _cooldownInSeconds: 1 _tooltipString: diff --git a/Assets/Prefabs/Buildings/Mill.prefab b/Assets/Prefabs/Buildings/Mill.prefab index cab7325..a1b82eb 100644 --- a/Assets/Prefabs/Buildings/Mill.prefab +++ b/Assets/Prefabs/Buildings/Mill.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 7635908653065262707} - component: {fileID: 4893380182456950857} - component: {fileID: 5051996996752872273} - - component: {fileID: 1038659306882990067} + - component: {fileID: 6061630371781146510} - component: {fileID: 1045236105932526234} m_Layer: 0 m_Name: Mill @@ -84,7 +84,7 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!114 &1038659306882990067 +--- !u!114 &6061630371781146510 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -93,14 +93,17 @@ MonoBehaviour: m_GameObject: {fileID: 1038659306882990064} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2c66f72e2c09df040a9196ed782233d6, type: 3} + m_Script: {fileID: 11500000, guid: 59a743c16ad953c4192f59706be0c243, type: 3} m_Name: m_EditorClassIdentifier: _lifeBar: {fileID: 4795252161776368380} - _hp: 10 + _hp: 0 _speed: 0 _attack_damage: 0 _attack_interval: 0 + _enemy: {fileID: 0} + _range: 2 + _multiplier: 1.15 --- !u!114 &1045236105932526234 MonoBehaviour: m_ObjectHideFlags: 0 @@ -229,6 +232,78 @@ Transform: m_Father: {fileID: 5939671854127199056} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5799165302180276253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6770826418803405524} + - component: {fileID: 4877144423808268021} + - component: {fileID: 2468754937282593442} + m_Layer: 6 + m_Name: range_outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6770826418803405524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799165302180276253} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5939671854127199056} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4877144423808268021 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799165302180276253} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3.26, y: 4.88} + newSize: {x: 3.26, y: 4.88} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 5, y: 5} + m_EdgeRadius: 0 +--- !u!114 &2468754937282593442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799165302180276253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3} + m_Name: + m_EditorClassIdentifier: + _entityLinked: {fileID: 6061630371781146510} --- !u!1 &6453988705367329854 GameObject: m_ObjectHideFlags: 0 @@ -260,6 +335,7 @@ Transform: m_Children: - {fileID: 1371331379827620356} - {fileID: 4768125905524963531} + - {fileID: 6770826418803405524} m_Father: {fileID: 7635908653065262707} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index bae83e5..af5ae09 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -3179,11 +3179,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3191,7 +3191,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1144883118211503064, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3243,11 +3243,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3255,7 +3255,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3423,11 +3423,11 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 0334115ab72f6d5449497db1bb50377e, type: 2} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3435,15 +3435,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3451,7 +3451,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4817988606444742093, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_Name @@ -3559,11 +3559,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3571,15 +3571,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3587,15 +3587,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3603,7 +3603,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3639,11 +3639,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3651,7 +3651,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -103.3 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5639720394327989355, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5639720394327989356, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3669,13 +3673,17 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -299.90002 objectReference: {fileID: 0} - - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} - propertyPath: m_AnchorMax.y + - target: {fileID: 6044811384361869331, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3683,7 +3691,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -201.6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6772290102801599907, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: _unitCardInformation @@ -3691,11 +3699,11 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: f4dcf11b827a5ca49a70b5db1e72e16e, type: 2} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3703,15 +3711,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3719,15 +3727,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3735,7 +3743,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8434244524890535526, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: _unitCardInformation diff --git a/Assets/Scripts/Ally/House.cs b/Assets/Scripts/Ally/House.cs index 6690074..0a3788a 100644 --- a/Assets/Scripts/Ally/House.cs +++ b/Assets/Scripts/Ally/House.cs @@ -1,6 +1,6 @@ public class House : Building { - public float PopulationGiven => GlobalConfig.Instance.Current.populationGivenPerHouse; + public virtual float PopulationGiven => GlobalConfig.Instance.Current.populationGivenPerHouse; public override void LevelStart() { ResourceManager.Instance.MaximumPopulation += PopulationGiven; diff --git a/Assets/Scripts/Ally/Mill.cs b/Assets/Scripts/Ally/Mill.cs new file mode 100644 index 0000000..2eab4e0 --- /dev/null +++ b/Assets/Scripts/Ally/Mill.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public class Mill : ProductionBuilding +{ + protected override Enum.ResourceNodeType RessourceNodeType { get { return Enum.ResourceNodeType.BerryBush; } } +} \ No newline at end of file diff --git a/Assets/Scripts/Ally/Mill.cs.meta b/Assets/Scripts/Ally/Mill.cs.meta new file mode 100644 index 0000000..3688b35 --- /dev/null +++ b/Assets/Scripts/Ally/Mill.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 59a743c16ad953c4192f59706be0c243 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Ally/ProductionBuilding.cs b/Assets/Scripts/Ally/ProductionBuilding.cs new file mode 100644 index 0000000..3824f44 --- /dev/null +++ b/Assets/Scripts/Ally/ProductionBuilding.cs @@ -0,0 +1,45 @@ +using UnityEngine; + +public abstract class ProductionBuilding : House +{ + [SerializeField] + private int _range; + [SerializeField] + private float _multiplier; + + public override float PopulationGiven => GlobalConfig.Instance.Current.populationGivenPerHouseUpgrade; + protected abstract Enum.ResourceNodeType RessourceNodeType { get; } + private Vector3 _position; + + public override void Start() + { + base.Start(); + _position = Position; + ApplyMultiplier(_multiplier); + } + + public override void LevelDestroy() + { + ApplyMultiplier(1 / _multiplier); + base.LevelDestroy(); + } + + private void ApplyMultiplier(float multiplier) + { + for (int i = -_range; i <= _range; i++) + { + for (int j = -_range; j <= _range; j++) + { + Vector3 checkPosition = new Vector3(_position.x + i, _position.y + j, _position.z); + + var tile = LevelManager.Instance.Get(t => t.Position == checkPosition); + if (tile == default) continue; + + var checkResourceType = tile.ResourceNodeType; + if (checkResourceType != RessourceNodeType) continue; + + tile.YieldSpeedMultiplier *= multiplier; + } + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Ally/ProductionBuilding.cs.meta b/Assets/Scripts/Ally/ProductionBuilding.cs.meta new file mode 100644 index 0000000..3794922 --- /dev/null +++ b/Assets/Scripts/Ally/ProductionBuilding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a8e2553295ecbca42b071a2eea2ed22d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/General/GlobalConfigFile.cs b/Assets/Scripts/General/GlobalConfigFile.cs index 2669970..f6840b9 100644 --- a/Assets/Scripts/General/GlobalConfigFile.cs +++ b/Assets/Scripts/General/GlobalConfigFile.cs @@ -29,6 +29,7 @@ public class GlobalConfigFile : ScriptableObject [Header("Population")] public int basePopulation = 5; public int populationGivenPerHouse = 5; + public int populationGivenPerHouseUpgrade = 15; public int populationCostPerUnit = 1; public float populationWarningPercentage = 0.75f; diff --git a/Assets/Scripts/Tiles/ResourceTile.cs b/Assets/Scripts/Tiles/ResourceTile.cs index ca6e765..485139e 100644 --- a/Assets/Scripts/Tiles/ResourceTile.cs +++ b/Assets/Scripts/Tiles/ResourceTile.cs @@ -10,7 +10,7 @@ public class ResourceTile : LevelTile private GameObject _yieldPrefab; [SerializeField] private Enum.ResourceNodeType _resourceNodeType; - + public Enum.ResourceNodeType ResourceNodeType => _resourceNodeType; public GameObject YieldPrefab => _yieldPrefab; private string YieldPrefabName => _yieldPrefab.name; @@ -20,6 +20,8 @@ public class ResourceTile : LevelTile private float _randomPositionConfig = 0.5f; private float _yieldCounter = 0; + private float _yieldSpeedMultiplier = 1.0f; + public override void LevelStart() { base.LevelStart(); @@ -48,7 +50,7 @@ public class ResourceTile : LevelTile var yielded = Instantiate(_yieldPrefab, yieldPosition, Quaternion.identity); yielded.transform.SetParent(LevelManager.Instance.LevelTransform); } - private void ResetYieldDuration() + private void ResetYieldDuration() { _yieldCounter = 0; var config = GlobalConfig.Instance.Current; @@ -58,11 +60,11 @@ public class ResourceTile : LevelTile { float min = config.randomHarvestDurationMinimum, max = config.randomHarvestDurationMaximum; - _yieldCounter = Random.Range(min, max); + _yieldCounter = Random.Range(min, max) / _yieldSpeedMultiplier; } else { - _yieldCounter = config.harvestDuration; + _yieldCounter = config.harvestDuration / _yieldSpeedMultiplier; } } public override bool Equals(ILevelObject other) @@ -84,4 +86,12 @@ public class ResourceTile : LevelTile var prefabName = dict[nameof(YieldPrefabName)].ToString(); _yieldPrefab = Database.Instance.Prefabs[prefabName]; } + + // GETTERS AND SETTERS + + public float YieldSpeedMultiplier + { + get { return _yieldSpeedMultiplier; } + set { _yieldSpeedMultiplier = value; } + } } \ No newline at end of file -- 2.34.1 From 1c68decec0b8cf73706281524f3018bb34e9f492 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 30 Jun 2025 04:10:38 -0400 Subject: [PATCH 2/4] workshop implemented --- .../Sprites/entities/buildings/workshop.png | Bin 0 -> 1456 bytes .../entities/buildings/workshop.png.meta | 123 ++++++ Assets/Design/UnitCards/Mill.asset | 4 +- Assets/Design/UnitCards/Workshop.asset | 19 + Assets/Design/UnitCards/Workshop.asset.meta | 8 + .../Buildings/Upgrade_Workshop.asset | 17 + .../Buildings/Upgrade_Workshop.asset.meta | 8 + Assets/Prefabs/Buildings/Workshop.prefab | 402 ++++++++++++++++++ Assets/Prefabs/Buildings/Workshop.prefab.meta | 7 + Assets/Scenes/Game.unity | 214 ++++++++++ Assets/Scripts/Ally/Workshop.cs | 6 + Assets/Scripts/Ally/Workshop.cs.meta | 11 + 12 files changed, 817 insertions(+), 2 deletions(-) create mode 100644 Assets/Art/Sprites/entities/buildings/workshop.png create mode 100644 Assets/Art/Sprites/entities/buildings/workshop.png.meta create mode 100644 Assets/Design/UnitCards/Workshop.asset create mode 100644 Assets/Design/UnitCards/Workshop.asset.meta create mode 100644 Assets/Design/UnitUpgrades/Buildings/Upgrade_Workshop.asset create mode 100644 Assets/Design/UnitUpgrades/Buildings/Upgrade_Workshop.asset.meta create mode 100644 Assets/Prefabs/Buildings/Workshop.prefab create mode 100644 Assets/Prefabs/Buildings/Workshop.prefab.meta create mode 100644 Assets/Scripts/Ally/Workshop.cs create mode 100644 Assets/Scripts/Ally/Workshop.cs.meta diff --git a/Assets/Art/Sprites/entities/buildings/workshop.png b/Assets/Art/Sprites/entities/buildings/workshop.png new file mode 100644 index 0000000000000000000000000000000000000000..792dbbeed7f571c9a8c86a1b5c5f587c769ef796 GIT binary patch literal 1456 zcmV;h1yA~kP)Px)YDq*vRCt{2oI7t5OBBb?qN@~1W!$6zDV=GMNQa0nRT`j-@)0PJ@=1^=`3M#z zNt24JM7J}N8{DO!p$V>%f@Ue=S-eEK-GP=`6v~6G39vzqM@bPSRHedE5>BWfS}|leO8kjR zStqlZ*6G_=;8#RNNocFq0swqGeFbOJ>uw`9N=|08jY?sT11z`&4i@C&>8suboiO48 zY8J&eiq&hES@|JY5VD!NF!F4A-4o%<;bHc)6>>h4lXDUrAs_yo006+j{utdsju?#4 zh;emxDF+vekc0g(-2A$Qn_stU+d*;2+4OqNK_?c$Ow=-(4Fs=mMWrk?I%I)#ks}y@ zQ?00j5s*g57t+;UA%c%E7}$lz*h2+o7xg)U1;Nsg029X7$*~uTrPElbosSVJNCN<^ zu6|&D=eQV?Ekl8b_KjHVh%Q z3r{nv&#}H>RLdFvPS+vbZQu3IRz`Lv&0jveb}Gr<%n@T?geeDdaV-J~4ub!qr|b zu6k)pUY3WXuP)VVqQ`GXF>+J9?Nw8h>{R)+?0j8{QU#;p+w`2|IIfXvnyFXO_LiXEVbxRA zlUwrs<%`y(D9ih(`(te}b-ov!mMH9@#J0W3A_SXjfTli(qOR5q?DIbO%_;V}R~y}B zsiWJ3EsA`*E+5C Date: Mon, 30 Jun 2025 04:39:16 -0400 Subject: [PATCH 3/4] implemented blacksmith --- .../Sprites/entities/buildings/blacksmith.png | Bin 0 -> 1578 bytes .../entities/buildings/blacksmith.png.meta | 123 ++++++ Assets/Design/UnitCards/Blacksmith.asset | 19 + Assets/Design/UnitCards/Blacksmith.asset.meta | 8 + .../Buildings/Upgrade_Blacksmith.asset | 17 + .../Buildings/Upgrade_Blacksmith.asset.meta | 8 + Assets/Prefabs/Buildings/Blacksmith.prefab | 402 ++++++++++++++++++ .../Prefabs/Buildings/Blacksmith.prefab.meta | 7 + Assets/Scenes/Game.unity | 255 ++++++++++- Assets/Scripts/Ally/Blacksmith.cs | 6 + Assets/Scripts/Ally/Blacksmith.cs.meta | 11 + 11 files changed, 833 insertions(+), 23 deletions(-) create mode 100644 Assets/Art/Sprites/entities/buildings/blacksmith.png create mode 100644 Assets/Art/Sprites/entities/buildings/blacksmith.png.meta create mode 100644 Assets/Design/UnitCards/Blacksmith.asset create mode 100644 Assets/Design/UnitCards/Blacksmith.asset.meta create mode 100644 Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset create mode 100644 Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset.meta create mode 100644 Assets/Prefabs/Buildings/Blacksmith.prefab create mode 100644 Assets/Prefabs/Buildings/Blacksmith.prefab.meta create mode 100644 Assets/Scripts/Ally/Blacksmith.cs create mode 100644 Assets/Scripts/Ally/Blacksmith.cs.meta diff --git a/Assets/Art/Sprites/entities/buildings/blacksmith.png b/Assets/Art/Sprites/entities/buildings/blacksmith.png new file mode 100644 index 0000000000000000000000000000000000000000..7eba6c47b332407d384a6c15d28a9cb97ed47b0b GIT binary patch literal 1578 zcmV+_2G#kAP)Px)OYG;LCvVZE|<$048d3JdY|QTIittw$Jx%K`tJ!} zOBI*`ZfXMwBrKUk`*M<0d&>|H^q|>}QOB9&sCL_V+8E-2Er2k{@Hvhfb6SQ3Vj3&p znH5}i(Do)|0H#t#+ibHgE|Xfx5BqGU8Hmqd4#O0h+in>WM^A$Kv1Nr# z9Nli~ka+Z!deli&X0$;)o(%w;93A!==imR(+g>i0R!Q8T-ZDf0U51Wp9Ybju5>BsF zog5wR2)Tdz2Cv_}SDQPxN^F9fkT5m?@ch{s0N};T%Wj7%Pxo)%001k*MH3RnM#-R1 zF$~^uZexf5CP@kpSv}f1q%fM0!e~PLiT-#tgj&WB$zZVqux+f6VyZ%R1V{vHI{@qF z9(5)E~S$atN7Zxr)tb($DL1lxP}ugl*vgD1R))%mix2zWeUy|$ zY`B5_fp(BF;Co*m^nP6XO~(zDq0nV;s zgajru=p2c&#E8lec1-y6@op#BRFY|bD!5Wb1%$}(?KkEC-<2$GY;cvTF^~#KjJTAO z2NTY92+aUJGeCsdkQhHqfpG=cC+HWC)?UXY$P!~!>c$WnG*h;i%92Y8?K8&oQEKea zkseEIUvJo>2Vwh8(BILnsqR=~2+IwCW2PObkG31vL%v4Q{bHi;$&|w8oAMa>+Re&!dCGTaBuXwgoIMy*fMD$y>~Se z+=s88_I{U6RiCMI?8wmMja{y66rUlk34tw3rjiwu;)THD_JvRB^6Hz1-imz^LQ;`i zhH0i%jgZ{Im7*KeRjtnX@EA8<&;^;Td|iCl|Nnm0G4RJvzu@7kr`>PWu8u7c{bR(S z&&qw}g{;)i&(GO?tJSLew^fXiLKlE!YzdW->bWh`gL6Y3lnZ^(VaD~bNiadh#A18g zl!1Ny1DUZK3D~)S(BRu3VnVOO71(TlJ~zdG+`Cwtfcv}q-uC=p9{iterBw6xhm)+- zU0I-upzSeIY>(AU4e4pGv&M2VVj=RgKT#=xq>v2;juDaBAv!MQMl?f)1m>%M{=)k9 zI;yY4tg95Hgm{+=Qx?n*=GcGy1OS4htX3>UowTnyr97=c|&=sP6l#i$N;L8&}cLo cjfMpO0{wry_GE%eKL7v#07*qoM6N<$g5c!`1ONa4 literal 0 HcmV?d00001 diff --git a/Assets/Art/Sprites/entities/buildings/blacksmith.png.meta b/Assets/Art/Sprites/entities/buildings/blacksmith.png.meta new file mode 100644 index 0000000..2256c5e --- /dev/null +++ b/Assets/Art/Sprites/entities/buildings/blacksmith.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 3de995023e33caf46bb3bf21e2949de2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Design/UnitCards/Blacksmith.asset b/Assets/Design/UnitCards/Blacksmith.asset new file mode 100644 index 0000000..f79faba --- /dev/null +++ b/Assets/Design/UnitCards/Blacksmith.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a92d696df7037b44585aaac56ec9ed98, type: 3} + m_Name: Blacksmith + m_EditorClassIdentifier: + _wood: 80 + _rock: 0 + _food: 0 + _cooldownInSeconds: 10 + _tooltipString: diff --git a/Assets/Design/UnitCards/Blacksmith.asset.meta b/Assets/Design/UnitCards/Blacksmith.asset.meta new file mode 100644 index 0000000..37fc5af --- /dev/null +++ b/Assets/Design/UnitCards/Blacksmith.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 865ba64414c55f245b62d64b83e0ec9d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset new file mode 100644 index 0000000..3379a7b --- /dev/null +++ b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d1391306ffe53984bb2bc314f1d2919f, type: 3} + m_Name: Upgrade_Blacksmith + m_EditorClassIdentifier: + _upgradeUnitCard: {fileID: 11400000, guid: 865ba64414c55f245b62d64b83e0ec9d, type: 2} + _upgradePrefab: {fileID: 1038659306882990064, guid: 4ef1b4ccbb03853448add8f179bc162c, type: 3} + _upgradeCardArt: {fileID: 21300000, guid: 3de995023e33caf46bb3bf21e2949de2, type: 3} diff --git a/Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset.meta b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset.meta new file mode 100644 index 0000000..17b232a --- /dev/null +++ b/Assets/Design/UnitUpgrades/Buildings/Upgrade_Blacksmith.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13f86b851462cf04884a0e0d6840e48b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Buildings/Blacksmith.prefab b/Assets/Prefabs/Buildings/Blacksmith.prefab new file mode 100644 index 0000000..a26dc10 --- /dev/null +++ b/Assets/Prefabs/Buildings/Blacksmith.prefab @@ -0,0 +1,402 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1038659306882990064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7635908653065262707} + - component: {fileID: 4893380182456950857} + - component: {fileID: 5051996996752872273} + - component: {fileID: -8192851348272142769} + - component: {fileID: 1045236105932526234} + m_Layer: 0 + m_Name: Blacksmith + m_TagString: Ally + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7635908653065262707 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038659306882990064} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.402152, y: 0.39607596, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5939671854127199056} + - {fileID: 1049296725658017964} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4893380182456950857 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038659306882990064} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &5051996996752872273 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038659306882990064} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1000000 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &-8192851348272142769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038659306882990064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af01580c336f55349a2871d7cf68e80b, type: 3} + m_Name: + m_EditorClassIdentifier: + _lifeBar: {fileID: 4795252161776368380} + _hp: 0 + _speed: 0 + _attack_damage: 0 + _attack_interval: 0 + _enemy: {fileID: 0} + _range: 2 + _multiplier: 1.15 +--- !u!114 &1045236105932526234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038659306882990064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52b5039c6ed892a42b71ae16566ae511, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &5799165302180276253 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6770826418803405524} + - component: {fileID: 4877144423808268021} + - component: {fileID: 2468754937282593442} + m_Layer: 6 + m_Name: range_outline + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6770826418803405524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799165302180276253} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5939671854127199056} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &4877144423808268021 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799165302180276253} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 3.26, y: 4.88} + newSize: {x: 3.26, y: 4.88} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 5, y: 5} + m_EdgeRadius: 0 +--- !u!114 &2468754937282593442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5799165302180276253} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3} + m_Name: + m_EditorClassIdentifier: + _entityLinked: {fileID: 0} +--- !u!1 &6453988705367329854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5939671854127199056} + - component: {fileID: 8933452427527575608} + m_Layer: 0 + m_Name: root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5939671854127199056 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6453988705367329854} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4768125905524963531} + - {fileID: 6770826418803405524} + m_Father: {fileID: 7635908653065262707} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &8933452427527575608 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6453988705367329854} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6d42b38c305a679498e86d4396f18a9b, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &8199056397416991447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4768125905524963531} + - component: {fileID: 4033240441719088282} + m_Layer: 0 + m_Name: blacksmith_building + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4768125905524963531 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8199056397416991447} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5939671854127199056} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4033240441719088282 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8199056397416991447} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 364159097 + m_SortingLayer: 1 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: 3de995023e33caf46bb3bf21e2949de2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.59, y: 1.47} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1001 &1868518140432677422 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7635908653065262707} + m_Modifications: + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalPosition.y + value: 0.57 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8131035023550608747, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + propertyPath: m_Name + value: HPSlider + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} +--- !u!4 &1049296725658017964 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + m_PrefabInstance: {fileID: 1868518140432677422} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4795252161776368380 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6584939087328067794, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} + m_PrefabInstance: {fileID: 1868518140432677422} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ff4f0f23ad79f2e4c92d0c20fe06071b, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Prefabs/Buildings/Blacksmith.prefab.meta b/Assets/Prefabs/Buildings/Blacksmith.prefab.meta new file mode 100644 index 0000000..aab63ca --- /dev/null +++ b/Assets/Prefabs/Buildings/Blacksmith.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4ef1b4ccbb03853448add8f179bc162c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 9bb0b58..d4e6549 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -2600,6 +2600,215 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!1001 &884817633 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1370991967} + m_Modifications: + - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_Name + value: Blacksmith + objectReference: {fileID: 0} + - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_SizeDelta.x + value: 82 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_SizeDelta.y + value: 97 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalScale.x + value: 0.7769 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalScale.y + value: 0.7769 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_LocalScale.z + value: 0.7769 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.x + value: -24.1 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.9 + objectReference: {fileID: 0} + - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3de995023e33caf46bb3bf21e2949de2, type: 3} + - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: _food + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: _wood + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: _prefab + value: + objectReference: {fileID: 1038659306882990064, guid: 4ef1b4ccbb03853448add8f179bc162c, type: 3} + - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} + propertyPath: _unitCardInformation + value: + objectReference: {fileID: 11400000, guid: 865ba64414c55f245b62d64b83e0ec9d, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} --- !u!1 &921843856 GameObject: m_ObjectHideFlags: 0 @@ -3072,7 +3281,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 5 objectReference: {fileID: 0} - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y @@ -3124,11 +3333,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 2debbbaa18345ef44b32b72cbcad01b0, type: 3} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -3136,15 +3345,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -47.711605 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -3152,15 +3361,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -26.874405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.x @@ -3168,7 +3377,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: m_AnchoredPosition.y - value: -6.0372024 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3} propertyPath: _food @@ -3452,11 +3661,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3464,7 +3673,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -47.711605 objectReference: {fileID: 0} - target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y @@ -3632,11 +3841,11 @@ PrefabInstance: objectReference: {fileID: 11400000, guid: 0334115ab72f6d5449497db1bb50377e, type: 2} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3644,15 +3853,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -6.0372024 objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3660,7 +3869,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4457185042551965567, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -26.874405 objectReference: {fileID: 0} - target: {fileID: 4817988606444742093, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_Name @@ -3884,15 +4093,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6044811384361869331, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.x @@ -3900,7 +4109,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6044811384361869332, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -201.6 objectReference: {fileID: 0} - target: {fileID: 6772290102801599907, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3} propertyPath: _unitCardInformation diff --git a/Assets/Scripts/Ally/Blacksmith.cs b/Assets/Scripts/Ally/Blacksmith.cs new file mode 100644 index 0000000..4fb6a9f --- /dev/null +++ b/Assets/Scripts/Ally/Blacksmith.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public class Blacksmith : ProductionBuilding +{ + protected override Enum.ResourceNodeType RessourceNodeType { get { return Enum.ResourceNodeType.Rock; } } +} \ No newline at end of file diff --git a/Assets/Scripts/Ally/Blacksmith.cs.meta b/Assets/Scripts/Ally/Blacksmith.cs.meta new file mode 100644 index 0000000..4b26ed5 --- /dev/null +++ b/Assets/Scripts/Ally/Blacksmith.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: af01580c336f55349a2871d7cf68e80b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- 2.34.1 From cd1ebf968dd75e6c84cb53e688bbd72baccd558f Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 30 Jun 2025 05:53:54 -0400 Subject: [PATCH 4/4] production buildings linked to house ugprade --- Assets/Prefabs/Buildings/Blacksmith.prefab | 27 ++++++---------------- Assets/Prefabs/Buildings/House.prefab | 2 ++ Assets/Prefabs/Buildings/Mill.prefab | 27 ++++++---------------- Assets/Prefabs/Buildings/Workshop.prefab | 27 ++++++---------------- Assets/Scripts/Ally/ProductionBuilding.cs | 11 +++++++-- 5 files changed, 32 insertions(+), 62 deletions(-) diff --git a/Assets/Prefabs/Buildings/Blacksmith.prefab b/Assets/Prefabs/Buildings/Blacksmith.prefab index a26dc10..10605d2 100644 --- a/Assets/Prefabs/Buildings/Blacksmith.prefab +++ b/Assets/Prefabs/Buildings/Blacksmith.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 4893380182456950857} - component: {fileID: 5051996996752872273} - component: {fileID: -8192851348272142769} - - component: {fileID: 1045236105932526234} m_Layer: 0 m_Name: Blacksmith m_TagString: Ally @@ -33,6 +32,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5939671854127199056} + - {fileID: 6770826418803405524} - {fileID: 1049296725658017964} m_Father: {fileID: 0} m_RootOrder: 0 @@ -102,20 +102,8 @@ MonoBehaviour: _attack_damage: 0 _attack_interval: 0 _enemy: {fileID: 0} - _range: 2 - _multiplier: 1.15 ---- !u!114 &1045236105932526234 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1038659306882990064} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 52b5039c6ed892a42b71ae16566ae511, type: 3} - m_Name: - m_EditorClassIdentifier: + _range: 1 + _multiplier: 10 --- !u!1 &5799165302180276253 GameObject: m_ObjectHideFlags: 0 @@ -146,7 +134,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5939671854127199056} + m_Father: {fileID: 7635908653065262707} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &4877144423808268021 @@ -173,7 +161,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 5, y: 5} + m_Size: {x: 3, y: 3} m_EdgeRadius: 0 --- !u!114 &2468754937282593442 MonoBehaviour: @@ -187,7 +175,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3} m_Name: m_EditorClassIdentifier: - _entityLinked: {fileID: 0} + _entityLinked: {fileID: -8192851348272142769} --- !u!1 &6453988705367329854 GameObject: m_ObjectHideFlags: 0 @@ -218,7 +206,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4768125905524963531} - - {fileID: 6770826418803405524} m_Father: {fileID: 7635908653065262707} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -336,7 +323,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Prefabs/Buildings/House.prefab b/Assets/Prefabs/Buildings/House.prefab index ee0760a..cd31566 100644 --- a/Assets/Prefabs/Buildings/House.prefab +++ b/Assets/Prefabs/Buildings/House.prefab @@ -137,6 +137,8 @@ MonoBehaviour: _upgradeUI: {fileID: 4817988606444742093, guid: 1d481c7093a8d2443a04261fd7c72be2, type: 3} _upgradeList: - {fileID: 11400000, guid: bb9859dfbbeec1d4583f967ab91c2248, type: 2} + - {fileID: 11400000, guid: 4a2a06e07aa635c4b9c78c94e0c34f80, type: 2} + - {fileID: 11400000, guid: 13f86b851462cf04884a0e0d6840e48b, type: 2} - {fileID: 11400000, guid: 20ad512fe083b804d85da6dafa69ecaf, type: 2} --- !u!61 &1993481641639217671 BoxCollider2D: diff --git a/Assets/Prefabs/Buildings/Mill.prefab b/Assets/Prefabs/Buildings/Mill.prefab index a1b82eb..69cdd3b 100644 --- a/Assets/Prefabs/Buildings/Mill.prefab +++ b/Assets/Prefabs/Buildings/Mill.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 4893380182456950857} - component: {fileID: 5051996996752872273} - component: {fileID: 6061630371781146510} - - component: {fileID: 1045236105932526234} m_Layer: 0 m_Name: Mill m_TagString: Ally @@ -33,6 +32,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5939671854127199056} + - {fileID: 6770826418803405524} - {fileID: 1049296725658017964} m_Father: {fileID: 0} m_RootOrder: 0 @@ -102,20 +102,8 @@ MonoBehaviour: _attack_damage: 0 _attack_interval: 0 _enemy: {fileID: 0} - _range: 2 - _multiplier: 1.15 ---- !u!114 &1045236105932526234 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1038659306882990064} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 52b5039c6ed892a42b71ae16566ae511, type: 3} - m_Name: - m_EditorClassIdentifier: + _range: 1 + _multiplier: 10 --- !u!1 &1371331378727130647 GameObject: m_ObjectHideFlags: 0 @@ -262,8 +250,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5939671854127199056} - m_RootOrder: 2 + m_Father: {fileID: 7635908653065262707} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &4877144423808268021 BoxCollider2D: @@ -289,7 +277,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 5, y: 5} + m_Size: {x: 3, y: 3} m_EdgeRadius: 0 --- !u!114 &2468754937282593442 MonoBehaviour: @@ -335,7 +323,6 @@ Transform: m_Children: - {fileID: 1371331379827620356} - {fileID: 4768125905524963531} - - {fileID: 6770826418803405524} m_Father: {fileID: 7635908653065262707} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -453,7 +440,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Prefabs/Buildings/Workshop.prefab b/Assets/Prefabs/Buildings/Workshop.prefab index a7bdb1f..c7c9d1c 100644 --- a/Assets/Prefabs/Buildings/Workshop.prefab +++ b/Assets/Prefabs/Buildings/Workshop.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 4893380182456950857} - component: {fileID: 5051996996752872273} - component: {fileID: 3252807573666191813} - - component: {fileID: 1045236105932526234} m_Layer: 0 m_Name: Workshop m_TagString: Ally @@ -33,6 +32,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5939671854127199056} + - {fileID: 6770826418803405524} - {fileID: 1049296725658017964} m_Father: {fileID: 0} m_RootOrder: 0 @@ -102,20 +102,8 @@ MonoBehaviour: _attack_damage: 0 _attack_interval: 0 _enemy: {fileID: 0} - _range: 2 - _multiplier: 1.15 ---- !u!114 &1045236105932526234 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1038659306882990064} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 52b5039c6ed892a42b71ae16566ae511, type: 3} - m_Name: - m_EditorClassIdentifier: + _range: 1 + _multiplier: 10 --- !u!1 &5799165302180276253 GameObject: m_ObjectHideFlags: 0 @@ -146,7 +134,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 5939671854127199056} + m_Father: {fileID: 7635908653065262707} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &4877144423808268021 @@ -173,7 +161,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 5, y: 5} + m_Size: {x: 3, y: 3} m_EdgeRadius: 0 --- !u!114 &2468754937282593442 MonoBehaviour: @@ -187,7 +175,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3} m_Name: m_EditorClassIdentifier: - _entityLinked: {fileID: 0} + _entityLinked: {fileID: 3252807573666191813} --- !u!1 &6453988705367329854 GameObject: m_ObjectHideFlags: 0 @@ -218,7 +206,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4768125905524963531} - - {fileID: 6770826418803405524} m_Father: {fileID: 7635908653065262707} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -336,7 +323,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Ally/ProductionBuilding.cs b/Assets/Scripts/Ally/ProductionBuilding.cs index 3824f44..d1dd136 100644 --- a/Assets/Scripts/Ally/ProductionBuilding.cs +++ b/Assets/Scripts/Ally/ProductionBuilding.cs @@ -18,6 +18,11 @@ public abstract class ProductionBuilding : House ApplyMultiplier(_multiplier); } + public override void LevelStart() + { + base.LevelStart(); + } + public override void LevelDestroy() { ApplyMultiplier(1 / _multiplier); @@ -26,12 +31,12 @@ public abstract class ProductionBuilding : House private void ApplyMultiplier(float multiplier) { + int x = 0; for (int i = -_range; i <= _range; i++) { for (int j = -_range; j <= _range; j++) { - Vector3 checkPosition = new Vector3(_position.x + i, _position.y + j, _position.z); - + Vector3 checkPosition = new Vector3(Mathf.Floor(_position.x) + i, Mathf.Floor(_position.y) + j, 0.0f); var tile = LevelManager.Instance.Get(t => t.Position == checkPosition); if (tile == default) continue; @@ -39,7 +44,9 @@ public abstract class ProductionBuilding : House if (checkResourceType != RessourceNodeType) continue; tile.YieldSpeedMultiplier *= multiplier; + x++; } } + Debug.Log(x); } } \ No newline at end of file -- 2.34.1