Skip to content

issue1 - avoid overlapping buildings with other buildings and resources #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Arkioner wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

issue1 - avoid overlapping buildings with other buildings and resources #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions Assets/Prefabs/Building/pfGoldHarvester.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: -5483501673927468613}
- component: {fileID: 7121943037289172064}
- component: {fileID: 5510354153519514294}
- component: {fileID: 8435505857811125823}
m_Layer: 0
m_Name: pfGoldHarvester
m_TagString: Untagged
Expand Down Expand Up @@ -72,6 +73,32 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
staticEntity: 1
--- !u!61 &8435505857811125823
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3517734329355596235}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
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: 6.2, y: 5.2}
m_EdgeRadius: 0
--- !u!1 &7123165971616880015
GameObject:
m_ObjectHideFlags: 0
Expand Down
27 changes: 27 additions & 0 deletions Assets/Prefabs/Building/pfStoneHarvester.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: -66247911382887460}
- component: {fileID: -2112022716432522367}
- component: {fileID: -4197449892386486031}
- component: {fileID: 3549194431606082666}
m_Layer: 0
m_Name: pfStoneHarvester
m_TagString: Untagged
Expand Down Expand Up @@ -72,6 +73,32 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
staticEntity: 1
--- !u!61 &3549194431606082666
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3517734329355596235}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
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: 6.2, y: 5.2}
m_EdgeRadius: 0
--- !u!1 &7123165971616880015
GameObject:
m_ObjectHideFlags: 0
Expand Down
27 changes: 27 additions & 0 deletions Assets/Prefabs/Building/pfWoodHarvester.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- component: {fileID: -5483501673927468613}
- component: {fileID: 7121943037289172064}
- component: {fileID: 2001307258709095567}
- component: {fileID: 746458151841036994}
m_Layer: 0
m_Name: pfWoodHarvester
m_TagString: Untagged
Expand Down Expand Up @@ -72,6 +73,32 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
staticEntity: 1
--- !u!61 &746458151841036994
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3517734329355596235}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
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: 6.2, y: 5.2}
m_EdgeRadius: 0
--- !u!1 &7123165971616880015
GameObject:
m_ObjectHideFlags: 0
Expand Down
29 changes: 28 additions & 1 deletion Assets/Prefabs/ResourceNode/pfGoldResourceNode.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ GameObject:
- component: {fileID: 6489814578582050358}
- component: {fileID: 2704560025984618176}
- component: {fileID: 9178035131945299688}
- component: {fileID: -1118847016100195170}
m_Layer: 0
m_Name: GoldResourceNode
m_Name: pfGoldResourceNode
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -76,6 +77,32 @@ CircleCollider2D:
m_Offset: {x: -0.05, y: 0}
serializedVersion: 2
m_Radius: 0.5
--- !u!61 &-1118847016100195170
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5270378484136657655}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
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!1 &6788625525579398857
GameObject:
m_ObjectHideFlags: 0
Expand Down
16 changes: 8 additions & 8 deletions Assets/Prefabs/ResourceNode/pfStoneResourceNode.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ GameObject:
- component: {fileID: 2663199901599497863}
- component: {fileID: 2663199901599497862}
- component: {fileID: 2663199901599497857}
- component: {fileID: 2663199901599497856}
- component: {fileID: 3308966918667719786}
m_Layer: 0
m_Name: StoneResourceNode
m_Name: pfStoneResourceNode
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -141,8 +141,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
AvailableResources: 01000000
--- !u!58 &2663199901599497856
CircleCollider2D:
--- !u!70 &3308966918667719786
CapsuleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
Expand All @@ -151,12 +151,12 @@ CircleCollider2D:
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.15, y: -0.15}
serializedVersion: 2
m_Radius: 0.5
m_Offset: {x: 0.1, y: 0.03}
m_Size: {x: 2.3, y: 1.15}
m_Direction: 1
--- !u!1 &2663199902348674213
GameObject:
m_ObjectHideFlags: 0
Expand Down
158 changes: 156 additions & 2 deletions Assets/Scenes/GameScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1773,12 +1773,12 @@ PrefabInstance:
- target: {fileID: 1433657386246857203, guid: cbf1b08779e480548a481d6ad59c97df,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.483
value: 2.294
objectReference: {fileID: 0}
- target: {fileID: 1433657386246857203, guid: cbf1b08779e480548a481d6ad59c97df,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.007
objectReference: {fileID: 0}
- target: {fileID: 1433657386246857203, guid: cbf1b08779e480548a481d6ad59c97df,
type: 3}
Expand Down Expand Up @@ -1835,6 +1835,11 @@ PrefabInstance:
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2542324283749245366, guid: cbf1b08779e480548a481d6ad59c97df,
type: 3}
propertyPath: m_SortingOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3562459056459611400, guid: cbf1b08779e480548a481d6ad59c97df,
type: 3}
propertyPath: m_SortingOrder
Expand Down Expand Up @@ -1911,3 +1916,152 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1dffbccb1338e3141af5f652e7224264, type: 3}
--- !u!1001 &2663199901850048242
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2663199901348565754, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_SortingOrder
value: 160
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497859, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_Name
value: StoneResourceNode
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalPosition.x
value: -3.152
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.604
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_RootOrder
value: 13
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2663199901599497863, guid: 6db101028cb49164a9d167bc480228d9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6db101028cb49164a9d167bc480228d9, type: 3}
--- !u!1001 &6203125430293430537
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalPosition.x
value: 6.052
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalPosition.y
value: -2.779
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4410099384192478908, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5270378484136657655, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_Name
value: GoldResourceNode
objectReference: {fileID: 0}
- target: {fileID: 6397114592151128435, guid: 28d2eb7516b7fd1479d1666ecc0bba2f,
type: 3}
propertyPath: m_SortingOrder
value: 277
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: -1118847016100195170, guid: 28d2eb7516b7fd1479d1666ecc0bba2f, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 28d2eb7516b7fd1479d1666ecc0bba2f, type: 3}
Loading