Skip to content

Commit

Permalink
updated game
Browse files Browse the repository at this point in the history
  • Loading branch information
jgiovanni committed Mar 17, 2017
1 parent edb2c08 commit fd1206a
Show file tree
Hide file tree
Showing 728 changed files with 45,474 additions and 5 deletions.
34 changes: 34 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*

# Visual Studio 2015 cache directory
/.vs/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

# Builds
*.apk
*.unitypackage
33 changes: 33 additions & 0 deletions Assembly-CSharp-Editor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,28 @@
<Compile Include="Assets\PlayMaker\Editor\PreUpdateChecker.cs" />
<Compile Include="Assets\PlayMaker\Editor\ReportWindow.cs" />
<Compile Include="Assets\iTween\PlayMaker\Editor\iTweenMoveToActionEditor.cs" />
<Compile Include="Assets\net.fabrejean\Editor\Common\Utils.cs" />
<Compile Include="Assets\net.fabrejean\Editor\Common\VersionInfo.cs" />
<Compile Include="Assets\net.fabrejean\Editor\MarkDownSharp\Escapes.cs" />
<Compile Include="Assets\net.fabrejean\Editor\MarkDownSharp\MarkDownFileInspector.cs" />
<Compile Include="Assets\net.fabrejean\Editor\MarkDownSharp\MarkdownGUI.cs" />
<Compile Include="Assets\net.fabrejean\Editor\MarkDownSharp\MarkdownParser.cs" />
<Compile Include="Assets\net.fabrejean\Editor\MarkDownSharp\ObjectInspector.cs" />
<Compile Include="Assets\net.fabrejean\Editor\PlayMaker\Ecosystem\Classes\EcosystemUtils.cs" />
<Compile Include="Assets\net.fabrejean\Editor\PlayMaker\Ecosystem\Classes\Item.cs" />
<Compile Include="Assets\net.fabrejean\Editor\PlayMaker\Ecosystem\Classes\ItemDocumentation.cs" />
<Compile Include="Assets\net.fabrejean\Editor\PlayMaker\Ecosystem\Classes\WebImageManager.cs" />
<Compile Include="Assets\net.fabrejean\Editor\PlayMaker\Ecosystem\EcosystemBrowser.cs" />
<Compile Include="Assets\net.fabrejean\Editor\PlayMaker\Ecosystem\Tools\ProjectScanner\ProjectScanner.cs" />
<Compile Include="Assets\net.fabrejean\Editor\Plugins\EditorCoroutine.cs" />
<Compile Include="Assets\net.fabrejean\Editor\Plugins\HttpWrapper.cs" />
<Compile Include="Assets\net.fabrejean\Editor\Plugins\JSON.cs" />
<None Include="Assets\PlayMaker\Templates\readme.txt" />
<None Include="Assets\PlayMaker\Readme.txt" />
<None Include="Assets\net.fabrejean\Editor\Common\GuiSkins\VolcanicGuiSkin\ReadMeForCredits.txt" />
<None Include="Assets\iTween\ReadMe!\ReadMe!.txt" />
<None Include="Assets\PlayMaker\Resources\PlayMakerAssemblies.txt" />
<None Include="Assets\net.fabrejean\Editor\Common\GuiSkins\README.txt" />
<None Include="Assets\PlayMaker\Versions\readme.txt" />
<Reference Include="UnityEngine.Analytics">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
Expand Down Expand Up @@ -198,6 +216,21 @@
</Reference>
<Reference Include="UnityEditor.OSXStandalone.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/macstandalonesupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.WebGL.Extensions">
<HintPath>/Applications/Unity/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Android.Extensions">
<HintPath>/Applications/Unity/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions">
<HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
<HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Common">
<HintPath>/Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\CameraFollow.cs" />
<Compile Include="Assets\FadeDead.cs" />
<Compile Include="Assets\PlayMaker Custom Actions\uGui\uGuiTextSetText.cs" />
<Compile Include="Assets\PlayMaker\Actions\ActivateGameObject.cs" />
<Compile Include="Assets\PlayMaker\Actions\AddAnimationClip.cs" />
<Compile Include="Assets\PlayMaker\Actions\AddComponent.cs" />
Expand Down Expand Up @@ -791,12 +794,17 @@
<Compile Include="Assets\PlayMaker\Actions\iTween\iTweenStop.cs" />
<Compile Include="Assets\PlayMaker\Include\iTweenFSMEvents.cs" />
<Compile Include="Assets\PlayMaker\UpdateHelper.cs" />
<Compile Include="Assets\PlayVideo.cs" />
<Compile Include="Assets\PlayerController.cs" />
<Compile Include="Assets\Scripts\GenerateNPCs.cs" />
<Compile Include="Assets\StripScroller.cs" />
<Compile Include="Assets\iTween\iTween.cs" />
<None Include="Assets\PlayMaker\Templates\readme.txt" />
<None Include="Assets\PlayMaker\Readme.txt" />
<None Include="Assets\net.fabrejean\Editor\Common\GuiSkins\VolcanicGuiSkin\ReadMeForCredits.txt" />
<None Include="Assets\iTween\ReadMe!\ReadMe!.txt" />
<None Include="Assets\PlayMaker\Resources\PlayMakerAssemblies.txt" />
<None Include="Assets\net.fabrejean\Editor\Common\GuiSkins\README.txt" />
<None Include="Assets\PlayMaker\Versions\readme.txt" />
<Reference Include="UnityEngine.Analytics">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
Expand Down
40 changes: 40 additions & 0 deletions Assets/CameraFollow.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class CameraFollow : MonoBehaviour {

public GameObject cameraTarget;
public GameObject player;

public float smoothTime = 0.1f;
public bool cameraFollowX = true;
public bool cameraFollowY = true;
public bool cameraFollowHeight = false;
public float cameraHeight = 2.5f;
public float xOffset = 1f;
public Vector2 velocity;
private Transform thisTransform;

// Use this for initialization
void Start () {
thisTransform = transform;
}

// Update is called once per frame
void Update () {
if (cameraFollowX) {
float newPosition = Mathf.SmoothDamp (thisTransform.position.x, cameraTarget.transform.position.x, ref velocity.x, smoothTime);

thisTransform.position = new Vector3(newPosition, thisTransform.position.y, thisTransform.position.z);
}

if (cameraFollowY) {

}

if (!cameraFollowY && cameraFollowHeight) {

}
}
}
12 changes: 12 additions & 0 deletions Assets/CameraFollow.cs.meta

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

Binary file added Assets/D_SMILEZ_-_03_-_Happy_Dreams.mp3
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/D_SMILEZ_-_03_-_Happy_Dreams.mp3.meta

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

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

public class FadeDead : MonoBehaviour
{
public int fadeSpeed = 3;
private bool isDone = false;
private Color matCol;
private Color newColor;
private float alfa = 0;

// Use this for initialization
void Start ()
{
Renderer renderer = gameObject.GetComponent<Renderer> ();
matCol = renderer.material.color;
}

// Update is called once per frame
void Update ()
{
Renderer renderer = gameObject.GetComponent<Renderer> ();
if (!isDone) {
alfa = renderer.material.color.a - Time.deltaTime / (fadeSpeed == 0 ? 1 : fadeSpeed);

if (gameObject.GetComponent<Rigidbody2D>() && alfa < 0.7) {
gameObject.GetComponent<Collider2D>().enabled = false;
Destroy(gameObject.GetComponent<Rigidbody2D>());
}

newColor = new Color (matCol.r, matCol.g, matCol.b, alfa);
renderer.material.SetColor ("_Color", newColor);
isDone = alfa <= 0 ? true : false;
} else {
gameObject.SetActive (false);
}
}
}
12 changes: 12 additions & 0 deletions Assets/FadeDead.cs.meta

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

Binary file modified Assets/Line.unity
Binary file not shown.
9 changes: 9 additions & 0 deletions Assets/Materials.meta

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

Binary file added Assets/Materials/background.mat
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Materials/background.mat.meta

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

Binary file added Assets/Materials/start_video.mat
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Materials/start_video.mat.meta

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

Binary file modified Assets/Menu.unity
Binary file not shown.
9 changes: 9 additions & 0 deletions Assets/PlayMaker Custom Actions.meta

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

9 changes: 9 additions & 0 deletions Assets/PlayMaker Custom Actions/uGui.meta

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

88 changes: 88 additions & 0 deletions Assets/PlayMaker Custom Actions/uGui/uGuiTextSetText.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
// (c) Copyright HutongGames, LLC 2010-2015. All rights reserved.
//--- __ECO__ __ACTION__ ---//

using UnityEngine;

namespace HutongGames.PlayMaker.Actions
{
[ActionCategory("uGui")]
[Tooltip("Sets the text value of a UGui Text component.")]
public class uGuiTextSetText : FsmStateAction
{
[RequiredField]
[CheckForComponent(typeof(UnityEngine.UI.Text))]
[Tooltip("The GameObject with the text ui component.")]
public FsmOwnerDefault gameObject;

[RequiredField]
[UIHint(UIHint.TextArea)]
[Tooltip("The text of the UGui Text component.")]
public FsmString text;

[Tooltip("Reset when exiting this state.")]
public FsmBool resetOnExit;

[Tooltip("Repeats every frame")]
public bool everyFrame;

private UnityEngine.UI.Text _text;
string _originalString;

public override void Reset()
{
gameObject = null;
text = null;
resetOnExit = null;
everyFrame = false;
}

public override void OnEnter()
{

GameObject _go = Fsm.GetOwnerDefaultTarget(gameObject);
if (_go!=null)
{
_text = _go.GetComponent<UnityEngine.UI.Text>();
}

if (resetOnExit.Value)
{
_originalString = _text.text;
}

DoSetTextValue();

if (!everyFrame)
{
Finish();
}
}

public override void OnUpdate()
{
DoSetTextValue();
}

void DoSetTextValue()
{

if (_text!=null)
{
_text.text = text.Value;
}
}

public override void OnExit()
{
if (_text==null)
{
return;
}

if (resetOnExit.Value)
{
_text.text = _originalString;
}
}
}
}
12 changes: 12 additions & 0 deletions Assets/PlayMaker Custom Actions/uGui/uGuiTextSetText.cs.meta

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

Binary file modified Assets/PlayMaker/Editor/Resources/EditorStartupPrefs.asset
Binary file not shown.
Binary file added Assets/PlayMaker/Resources/PlayMakerGlobals.asset
Binary file not shown.
Loading

0 comments on commit fd1206a

Please sign in to comment.