Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
GOOODBYYYYE MOONMEN
  • Loading branch information
smz11006 committed Nov 10, 2015
1 parent 6e157e7 commit 1d0e265
Show file tree
Hide file tree
Showing 34 changed files with 72 additions and 4 deletions.
Binary file modified ShipShooter/Assets/Scenes/GameScene.unity
Binary file not shown.
Binary file added ShipShooter/Assets/Scenes/ShipLose.unity
Binary file not shown.
8 changes: 8 additions & 0 deletions ShipShooter/Assets/Scenes/ShipLose.unity.meta

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

Binary file added ShipShooter/Assets/Scenes/ShipMenu.unity
Binary file not shown.
8 changes: 8 additions & 0 deletions ShipShooter/Assets/Scenes/ShipMenu.unity.meta

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

Binary file added ShipShooter/Assets/Scenes/ShipWin.unity
Binary file not shown.
8 changes: 8 additions & 0 deletions ShipShooter/Assets/Scenes/ShipWin.unity.meta

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

25 changes: 25 additions & 0 deletions ShipShooter/Assets/Scripts/Boundries.cs
@@ -0,0 +1,25 @@
using UnityEngine;
using System.Collections;

public class Boundries : MonoBehaviour
{
void OnCollisionEnter(Collision collision)
{
if (collision.gameObject.CompareTag("EnemyBullet"))
{
Destroy(collision.gameObject);

}

if (collision.gameObject.CompareTag("Enemy"))
{
Destroy(collision.gameObject);

}
if (collision.gameObject.CompareTag("Bullet"))
{
Destroy(collision.gameObject);

}
}
}
12 changes: 12 additions & 0 deletions ShipShooter/Assets/Scripts/Boundries.cs.meta

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

10 changes: 6 additions & 4 deletions ShipShooter/Assets/Scripts/Enemy1.cs
Expand Up @@ -7,6 +7,7 @@ public class Enemy1 : MonoBehaviour {


public Vector3 enemyAngle = new Vector3(0, 90, 270); public Vector3 enemyAngle = new Vector3(0, 90, 270);
public float test; public float test;
public int testInt;


//shooting ----------------------- //shooting -----------------------
public GameObject turret; public GameObject turret;
Expand All @@ -27,12 +28,13 @@ public class Enemy1 : MonoBehaviour {
void Update() void Update()
{ {
test = gameObject.transform.position.y; test = gameObject.transform.position.y;
//shooting--------------------------------------------------------------------------------- testInt = Mathf.RoundToInt(test);
posCanon = new Vector3(turret.transform.position.x, turret.transform.position.y - 0.5f, turret.transform.position.z); //shooting---------------------------------------------------------------------------------
if (test % 2 == 0) posCanon = new Vector3(turret.transform.position.x, turret.transform.position.y - 0.5f, turret.transform.position.z);
if (testInt % 2 == 0)
{ {
newBullet = (GameObject)Instantiate(bullet, posCanon, transform.rotation); newBullet = (GameObject)Instantiate(bullet, posCanon, transform.rotation);
iTween.MoveTo(posCanon, new Vector3(posCanon.transform.position.x, posCanon.transform.position.y - 20, 5), 1); iTween.MoveTo(newBullet, new Vector3(newBullet.transform.position.x, newBullet.transform.position.y - 40, 5), 1);


} }


Expand Down
4 changes: 4 additions & 0 deletions ShipShooter/Assets/Scripts/PlayerHealth.cs
Expand Up @@ -62,6 +62,10 @@ public class PlayerHealth : MonoBehaviour {
} }
} }


if (playerHealth == 0)
{
}

//Start----------------------------------------------------------- //Start-----------------------------------------------------------
void Start() void Start()
{ {
Expand Down
Binary file modified ShipShooter/Library/CurrentLayout.dwlt
Binary file not shown.
Binary file modified ShipShooter/Library/EditorUserBuildSettings.asset
Binary file not shown.
Binary file modified ShipShooter/Library/InspectorExpandedItems.asset
Binary file not shown.
Binary file not shown.
Binary file modified ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Binary file not shown.
Binary file modified ShipShooter/Library/assetDatabase3
Binary file not shown.
Binary file modified ShipShooter/Library/expandedItems
Binary file not shown.
Binary file modified ShipShooter/Library/metadata/00/00000000000000003000000000000000
Binary file not shown.
Binary file modified ShipShooter/Library/metadata/00/00000000000000004000000000000000
Binary file not shown.
Binary file modified ShipShooter/Library/metadata/00/0000000000000000b000000000000000
Binary file not shown.
Binary file modified ShipShooter/Library/metadata/3d/3d6f92a605a842645b772002f4f174a9
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ShipShooter/Library/metadata/b3/b3fbc82f895666d44928830fde115913
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified ShipShooter/ProjectSettings/EditorBuildSettings.asset
Binary file not shown.
Binary file modified ShipShooter/ProjectSettings/TagManager.asset
Binary file not shown.
1 change: 1 addition & 0 deletions ShipShooter/ShipShooter.CSharp.csproj
Expand Up @@ -69,6 +69,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Assets\Scripts\BackgroundScroll.cs" /> <Compile Include="Assets\Scripts\BackgroundScroll.cs" />
<Compile Include="Assets\Scripts\Boundries.cs" />
<Compile Include="Assets\Scripts\Enemy1.cs" /> <Compile Include="Assets\Scripts\Enemy1.cs" />
<Compile Include="Assets\Scripts\Enemy2.cs" /> <Compile Include="Assets\Scripts\Enemy2.cs" />
<Compile Include="Assets\Scripts\EnemySpawner.cs" /> <Compile Include="Assets\Scripts\EnemySpawner.cs" />
Expand Down

0 comments on commit 1d0e265

Please sign in to comment.