Skip to content

Commit

Permalink
Base building fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Ayerdi authored and Alex Ayerdi committed Feb 9, 2015
1 parent 7769ae8 commit 1365ece
Show file tree
Hide file tree
Showing 5 changed files with 174 additions and 154 deletions.
10 changes: 5 additions & 5 deletions Assets/Base/Attachments/Attachments.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ void Start () {

// Update is called once per frame
void Update () {
if (selected && Center.selectedBasePiece != this.transform)
if (selected && Center.selectedBasePiece != this.transform.parent)
{
SpriteRenderer sr = this.transform.GetComponent<SpriteRenderer>();
SpriteRenderer sr = this.transform.parent.GetComponentInParent<SpriteRenderer>();
sr.color = new Color(255.0f, 255.0f, 255.0f);
selected = false;
}
}

void OnMouseDown()
void OnMouseDown() //will be selecting the tower piece, not the bottom piece
{
if (!selected && Input.GetButtonDown("Select"))
{
Debug.Log("CLICKED ON ATTACHMENT!");

Center.selectedBasePiece = this.transform;
SpriteRenderer sr = Center.selectedBasePiece.FindChild("Bottom(Clone)").GetComponent<SpriteRenderer>();
Center.selectedBasePiece = this.transform.parent;
SpriteRenderer sr = Center.selectedBasePiece.GetComponent<SpriteRenderer>();
sr.color = new Color(0.0f, 219.0f, 255.0f);
selected = true;
}
Expand Down
13 changes: 13 additions & 0 deletions Assets/Base/Attachments/Turret.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ GameObject:
- 114: {fileID: 11477802}
- 50: {fileID: 5061682}
- 114: {fileID: 11468976}
- 61: {fileID: 6146754}
m_Layer: 0
m_Name: Turret
m_TagString: Untagged
Expand Down Expand Up @@ -46,6 +47,17 @@ Rigidbody2D:
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
--- !u!61 &6146754
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 155352}
m_Enabled: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Size: {x: 5, y: 5}
m_Center: {x: 0, y: 0}
--- !u!114 &11468976
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -57,6 +69,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 719bfcc1471504bf4aa8869de4c10071, type: 3}
m_Name:
m_EditorClassIdentifier:
publicAngle: 0
--- !u!114 &11477802
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
6 changes: 4 additions & 2 deletions Assets/Base/Center.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ void OnTriggerEnter (Collider collision) {
void OnMouseDown()
{
if (!selected && Input.GetButtonDown("Select"))
{
{
Debug.Log("Clicked on main base!");

selectedBasePiece = this.transform;
SpriteRenderer sr = selectedBasePiece.GetComponent<SpriteRenderer>();
sr.color = new Color(0.0f, 219.0f, 255.0f); // "selected" color
Expand All @@ -66,7 +68,7 @@ void Update () {

if (selected && Center.selectedBasePiece != this.transform)
{
SpriteRenderer sr = this.transform.FindChild("Bottom").GetComponent<SpriteRenderer>();
SpriteRenderer sr = this.transform.GetComponent<SpriteRenderer>();
sr.color = new Color(255.0f, 255.0f, 255.0f); //return to original sprite color
selected = false;
}
Expand Down
294 changes: 147 additions & 147 deletions Assets/_Scenes/BlorbGame.unity

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions Assets/terrain/Materials.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1365ece

Please sign in to comment.