Skip to content

Commit

Permalink
🔖 v1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kyechan99 committed May 11, 2017
1 parent 546ff13 commit ab79344
Show file tree
Hide file tree
Showing 105 changed files with 196 additions and 160 deletions.
Binary file modified Assets/00. Logo/Logo.unity
Binary file not shown.
8 changes: 7 additions & 1 deletion Assets/00. Logo/Script/LogoCtrl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ public class LogoCtrl : MonoBehaviour {
[SerializeField]
Text _text;

[SerializeField]
Save _save;

private void Start ()
{
_text.text = string.Empty;
Expand All @@ -28,7 +31,10 @@ private IEnumerator Squncer()
yield return new WaitForSeconds(0.5f);
_text.gameObject.SetActive(false);
yield return new WaitForSeconds(0.5f);
SceneManager.LoadScene("InGame");
if (_save.isFirst)
SceneManager.LoadScene("Tutorial");
else
SceneManager.LoadScene("InGame");
}

private void Update()
Expand Down
51 changes: 51 additions & 0 deletions Assets/00. Tutorial/Script/TutorialCtrl.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;

public class TutorialCtrl : MonoBehaviour {

[SerializeField]
Save _save;

[SerializeField]
Transform[] _targets;

int _index = 0;
[SerializeField]
bool _isRun = false;

void Awake ()
{
_save.isFirst = false;
}

public void Touch()
{
StartCoroutine("Pass");
}

private IEnumerator Pass()
{
if (_isRun)
yield break;
_isRun = true;
if (_index.Equals(1))
{
SceneManager.LoadScene("InGame");
yield break;
}

float time = 0f;
while(true)
{
if (_targets[_index].localPosition.x.Equals(-720))
break;
time += Time.deltaTime;
_targets[_index].localPosition = ALLerp.Lerp(_targets[_index].localPosition, new Vector3(-720f, 0f, 0f), time);
yield return null;
}
_index++;
_isRun = false;
}
}
Binary file added Assets/00. Tutorial/Sprite/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/00. Tutorial/Sprite/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/00. Tutorial/Sprite/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/00. Tutorial/Sprite/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/00. Tutorial/Tutorial.unity
Binary file not shown.
Binary file modified Assets/01. InGame/Animation/Result/Result_FadeIn.anim
Binary file not shown.
Binary file modified Assets/01. InGame/Animation/Result/Result_FadeOut.anim
Binary file not shown.
Binary file modified Assets/01. InGame/Animation/UI/Pause_BG_FadeIn.anim
Binary file not shown.
Binary file modified Assets/01. InGame/Animation/UI/Pause_BG_FadeOut.anim
Binary file not shown.
Binary file added Assets/01. InGame/Animation/UI/Text.controller
Binary file not shown.
Binary file not shown.
Binary file added Assets/01. InGame/Fonts/모리스체.ttf
Binary file not shown.
Binary file modified Assets/01. InGame/InGame.unity
Binary file not shown.
21 changes: 15 additions & 6 deletions Assets/01. InGame/Scripts/GameManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ public class GameManager : ALComponentSingleton<GameManager>
[SerializeField]
CHAR.Character character;

[SerializeField]
private AudioSource _audioManager;

[SerializeField]
private AudioSource _seDie;

Expand All @@ -44,11 +47,12 @@ public class GameManager : ALComponentSingleton<GameManager>

void Awake()
{
if (PlayerPrefs.HasKey("BESTSCORE"))
if (!PlayerPrefs.HasKey("BESTSCORE"))
PlayerPrefs.SetInt("BESTSCORE", 0);
bestScoreText.text = "" + PlayerPrefs.GetInt("BESTSCORE");

MapGenerator.instance.init();
//_audioManager.volume *= 0.5f;
}

void Update()
Expand Down Expand Up @@ -108,13 +112,17 @@ public void reStartBT()
/// </summary>
public void gameStart()
{
character.init();
//_audioManager.volume = 1f;
if (!start)
{
character.init();

score = 0;
scoreText.text = (uint)score + "";
score = 0;
scoreText.text = (uint)score + "";

pause = false;
start = true;
pause = false;
start = true;
}
}

/// <summary>
Expand All @@ -124,6 +132,7 @@ public void gameEnd()
{
if (start)
{
//_audioManager.volume *= 0.5f;
int index = Random.Range(0, _clips.Length);
_seDie.clip = _clips[index];
_seDie.Play();
Expand Down
Binary file removed Assets/01. InGame/Songs/AE03048.mp3
Binary file not shown.
Binary file added Assets/01. InGame/Songs/AE030481.mp3
Binary file not shown.
Binary file removed Assets/01. InGame/Songs/AE03049.mp3
Binary file not shown.
Binary file added Assets/01. InGame/Songs/AE030491.mp3
Binary file not shown.
Binary file removed Assets/01. InGame/Songs/AE03050.mp3
Binary file not shown.
Binary file added Assets/01. InGame/Songs/AE030501.mp3
Binary file not shown.
Binary file removed Assets/01. InGame/Songs/AE03051.mp3
Binary file not shown.
Binary file added Assets/01. InGame/Songs/AE030511.mp3
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Anywhere/Prefabs/Save.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class Save : MonoBehaviour {

public bool isFirst = true;
}
Binary file added Assets/Anywhere/Prefabs/Save.prefab
Binary file not shown.
13 changes: 0 additions & 13 deletions Assets/Anywhere/State.cs

This file was deleted.

81 changes: 0 additions & 81 deletions Assets/Anywhere/StateController.cs

This file was deleted.

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

public class TextRandom : MonoBehaviour
{
[SerializeField]
UnityEngine.UI.Text creditText;

void Awake()
{
int[] arr = new int[6];

for (int i = 0; i < 6; i++)
arr[i] = i;

for (int i = 0; i< 6; i++)
{
int n = Random.Range(0, 6 - i);
switch (arr[n])
{
case 0:
creditText.text += "그래픽 : 박준철\n";
break;
case 1:
creditText.text += "프로그래밍 : 김덕원\n";
break;
case 2:
creditText.text += "기획 : 양도훈\n";
break;
case 3:
creditText.text += "기획 : 강의택\n";
break;
case 4:
creditText.text += "프로그래밍 : 강예찬\n";
break;
case 5:
creditText.text += "사운드 : 김혁수\n";
break;
}
int temp = arr[n];
arr[n] = arr[5-i];
arr[5-i] = temp;
}

creditText.text += "크레딧의 순서는 랜덤입니다.";
}
}
Binary file not shown.
Loading

0 comments on commit ab79344

Please sign in to comment.