Skip to content

Commit

Permalink
V1: See description
Browse files Browse the repository at this point in the history
-Fixed sizing issues
-Tried out a build
-Home Screen/Game Over
  • Loading branch information
CaptainGinyu committed Oct 7, 2016
1 parent 13bd20f commit d765371
Show file tree
Hide file tree
Showing 1,110 changed files with 63,623 additions and 20,107 deletions.
4 changes: 0 additions & 4 deletions Assembly-CSharp-Editor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\Editor\CrossPlatformInput\CrossPlatformInputInitialize.cs" />
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\Standard Assets\Cameras\CameraGuidelines.txt" />
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -104,8 +102,6 @@
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{9DE912A3-D455-E0E1-EDA4-AE0C1F90791C}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
<ProjectReference Include="Assembly-CSharp.csproj">
<Project>{CB5587A4-F68B-377D-346D-FFA560226404}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
</ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions Assembly-CSharp-firstpass.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,8 @@
<Compile Include="Assets\Standard Assets\Cameras\Scripts\ProtectCameraFromWallClip.cs" />
<Compile Include="Assets\Standard Assets\Cameras\Scripts\TargetFieldOfView.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\AxisTouchButton.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\ButtonHandler.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\CrossPlatformInputManager.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\InputAxisScrollbar.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\Joystick.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\MobileControlRig.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\MobileInput.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\PlatformSpecific\StandaloneInput.cs" />
<Compile Include="Assets\Standard Assets\CrossPlatformInput\Scripts\TiltInput.cs" />
Expand Down
12 changes: 6 additions & 6 deletions Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,18 @@
<Compile Include="Assets\Assets\Scripts\Camera2DFollow.cs" />
<Compile Include="Assets\Assets\Scripts\CutsceneContinue.cs" />
<Compile Include="Assets\Assets\Scripts\CutsceneGameController.cs" />
<Compile Include="Assets\Assets\Scripts\DecideBetweenFireAndStove.cs" />
<Compile Include="Assets\Assets\Scripts\DecideWhichPondToShow.cs" />
<Compile Include="Assets\Assets\Scripts\DecideWhichWaterJugToShow.cs" />
<Compile Include="Assets\Assets\Scripts\DirectionFacingMover.cs" />
<Compile Include="Assets\Assets\Scripts\DirtyMaker.cs" />
<Compile Include="Assets\Assets\Scripts\EnemyThatKillsFood.cs" />
<Compile Include="Assets\Assets\Scripts\ExitShop.cs" />
<Compile Include="Assets\Assets\Scripts\FoodHealthAffector.cs" />
<Compile Include="Assets\Assets\Scripts\GameController.cs" />
<Compile Include="Assets\Assets\Scripts\GameControllerForLevel.cs" />
<Compile Include="Assets\Assets\Scripts\GoToHomeScreen.cs" />
<Compile Include="Assets\Assets\Scripts\GoToMainGame.cs" />
<Compile Include="Assets\Assets\Scripts\HealthAffector.cs" />
<Compile Include="Assets\Assets\Scripts\Item.cs" />
<Compile Include="Assets\Assets\Scripts\ItemManager.cs" />
Expand All @@ -68,13 +73,12 @@
<Compile Include="Assets\Assets\Scripts\PlayerController.cs" />
<Compile Include="Assets\Assets\Scripts\PlayerManager.cs" />
<Compile Include="Assets\Assets\Scripts\PoopHealthAffector.cs" />
<Compile Include="Assets\Assets\Scripts\ResetScore.cs" />
<Compile Include="Assets\Assets\Scripts\ShopItem.cs" />
<Compile Include="Assets\Assets\Scripts\ShowFinalScore.cs" />
<Compile Include="Assets\Assets\Scripts\SourceModifier.cs" />
<Compile Include="Assets\Assets\Scripts\WaterCleaner.cs" />
<Compile Include="Assets\Assets\Scripts\WaterSource.cs" />
<None Include="Assets\Standard Assets\CrossPlatformInput\CrossPlatformInputGuidelines.txt" />
<None Include="Assets\Standard Assets\Cameras\CameraGuidelines.txt" />
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
Expand All @@ -88,10 +92,6 @@
<HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{9DE912A3-D455-E0E1-EDA4-AE0C1F90791C}</Project> <Name>Assembly-CSharp-firstpass</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Assets/Resources/Fantasy_Game_Background_Looping.mp3.meta

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

Binary file added Assets/Assets/Resources/coveredWaterJug.prefab
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Assets/Resources/coveredWaterJug.prefab.meta

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

Binary file modified Assets/Assets/Resources/pond.prefab
Binary file not shown.
Binary file added Assets/Assets/Resources/pondFiltered.prefab
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Assets/Resources/pondFiltered.prefab.meta

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

Binary file modified Assets/Assets/Resources/stove.prefab
Binary file not shown.
Binary file modified Assets/Assets/Resources/waterDrop.prefab
Binary file not shown.
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Assets/Resources/waterFilterShopItem.prefab.meta

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

Binary file modified Assets/Assets/Resources/waterJug.prefab
Binary file not shown.
Binary file modified Assets/Assets/Resources/waterJugCap.prefab
Binary file not shown.
8 changes: 5 additions & 3 deletions Assets/Assets/Scripts/BulletItemController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ protected virtual void OnTriggerEnter2D(Collider2D other)
{
Killable killable = other.gameObject.GetComponent<Killable>();
if (killable != null) {
foreach (string potentialVictim in whatThisAffects) {
if (killable.nameOfThis.Equals (potentialVictim)) {
foreach (string potentialVictim in whatThisAffects)
{
if (killable.nameOfThis.Equals(potentialVictim))
{
Destroy (other.gameObject);
GameControllerForLevel.score += killable.pointsGivenIfKilled;
GameControllerForLevel.recordedPoints += killable.pointsGivenIfKilled;
GameControllerForLevel.UpdateScoreText ();
GameControllerForLevel.UpdateScoreText();
break;
}
}
Expand Down
26 changes: 26 additions & 0 deletions Assets/Assets/Scripts/DecideBetweenFireAndStove.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using UnityEngine;
using System.Collections;

public class DecideBetweenFireAndStove : MonoBehaviour
{
void Start()
{
GameObject fireOrStove;

if (GameController.stovePurchased)
{
fireOrStove = Resources.Load("stove") as GameObject;
}
else
{
fireOrStove = Resources.Load("campfire") as GameObject;
}

foreach (Transform child in transform)
{
GameObject instantiatedFireOrStove = Instantiate(fireOrStove);
instantiatedFireOrStove.transform.parent = child;
instantiatedFireOrStove.transform.position = child.position;
}
}
}
12 changes: 12 additions & 0 deletions Assets/Assets/Scripts/DecideBetweenFireAndStove.cs.meta

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

22 changes: 22 additions & 0 deletions Assets/Assets/Scripts/DecideWhichPondToShow.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using UnityEngine;
using System.Collections;

public class DecideWhichPondToShow : MonoBehaviour
{
void Start()
{
GameObject pond;

if (GameController.waterFilterPurchased)
{
pond = Instantiate(Resources.Load("pondFiltered") as GameObject);
}
else
{
pond = Instantiate(Resources.Load("pond") as GameObject);
}

pond.transform.parent = transform;
pond.transform.position = transform.position;
}
}
12 changes: 12 additions & 0 deletions Assets/Assets/Scripts/DecideWhichPondToShow.cs.meta

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

26 changes: 26 additions & 0 deletions Assets/Assets/Scripts/DecideWhichWaterJugToShow.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using UnityEngine;
using System.Collections;

public class DecideWhichWaterJugToShow : MonoBehaviour
{
void Start()
{
GameObject waterJug;

if (GameController.waterJugCapPurchased)
{
waterJug = Resources.Load("coveredWaterJug") as GameObject;
}
else
{
waterJug = Resources.Load("waterJug") as GameObject;
}

foreach (Transform child in transform)
{
GameObject instantiatedWaterJug = Instantiate(waterJug);
instantiatedWaterJug.transform.parent = child;
instantiatedWaterJug.transform.position = child.position;
}
}
}
12 changes: 12 additions & 0 deletions Assets/Assets/Scripts/DecideWhichWaterJugToShow.cs.meta

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

6 changes: 6 additions & 0 deletions Assets/Assets/Scripts/GameControllerForLevel.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

public class GameControllerForLevel : GameController
{
public int pointsToEndLevel;

public static float recordedPoints;

private Text pointsToEndLevelText;

override protected void Start()
{
base.Start();
recordedPoints = 0;

pointsToEndLevelText = GameObject.Find("Points to End Level Text").GetComponent<Text>();
pointsToEndLevelText.text = "Points to End Level: " + pointsToEndLevel;
}

void Update()
Expand Down
10 changes: 10 additions & 0 deletions Assets/Assets/Scripts/GoToHomeScreen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using UnityEngine;
using System.Collections;

public class GoToHomeScreen : MonoBehaviour
{
public void ButtonClick()
{
Application.LoadLevel("homeScreen");
}
}
12 changes: 12 additions & 0 deletions Assets/Assets/Scripts/GoToHomeScreen.cs.meta

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

10 changes: 10 additions & 0 deletions Assets/Assets/Scripts/GoToMainGame.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using UnityEngine;
using System.Collections;

public class GoToMainGame : MonoBehaviour
{
public void ButtonClick()
{
Application.LoadLevel("mainGame");
}
}
12 changes: 12 additions & 0 deletions Assets/Assets/Scripts/GoToMainGame.cs.meta

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

14 changes: 14 additions & 0 deletions Assets/Assets/Scripts/ResetScore.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using UnityEngine;
using System.Collections;

public class ResetScore : MonoBehaviour
{
void Start()
{
GameController.score = 0;
GameController.waterFilterPurchased = false;
GameController.stovePurchased = false;
GameController.mosquitoNetPurchased = false;
GameController.waterJugCapPurchased = false;
}
}
12 changes: 12 additions & 0 deletions Assets/Assets/Scripts/ResetScore.cs.meta

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

Loading

0 comments on commit d765371

Please sign in to comment.