Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

production buildings linked to house ugprade

Browse Source
This commit is contained in:
Adam Salah 2025-06-30 05:53:54 -04:00
parent d2b189a6ee
commit cd1ebf968d
5 changed files with 32 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Assets/Prefabs/Buildings/Blacksmith.prefab
View File

@ -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

2
Assets/Prefabs/Buildings/House.prefab
View File

@ -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:

27
Assets/Prefabs/Buildings/Mill.prefab
View File

@ -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

27
Assets/Prefabs/Buildings/Workshop.prefab
View File

@ -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

11
Assets/Scripts/Ally/ProductionBuilding.cs
View File

@ -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<ResourceTile>(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);
}
}