Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 5280 additions and 1532 deletions
Assets/Scenes/sceneRaffael.unity
View file @ db2bb2a1
This source diff could not be displayed because it is too large. You can view the blob instead.
Assets/Physics.meta → Assets/Scripts/Factory.meta
View file @ db2bb2a1
fileFormatVersion: 2
guid: 5097a5d46361eda43b5a45ce166e49aa
guid: 81e39c4f6e44e7345849a14cbef3b3ea
folderAsset: yes
DefaultImporter:
externalObjects: {}
......
Assets/LoseNature.cs → Assets/Scripts/Factory/LoseNature.cs
View file @ db2bb2a1
......@@ -16,7 +16,7 @@ public class LoseNature : MonoBehaviour
{
nbFactory = GameObject.FindGameObjectsWithTag("factory").Length;
Debug.Log("il pert de la vie: " + nbFactory * damageByFactory);
//collision.GetComponent<PlayerNature>().LooseNature(damageByFactory * nbFactory);
collision.GetComponent<PlayerNature>().LooseNature(damageByFactory * nbFactory);
this.lostLife = true;
}
}
......
Assets/LoseNature.cs.meta → Assets/Scripts/Factory/LoseNature.cs.meta
View file @ db2bb2a1
fileFormatVersion: 2
guid: 66de21900d4274ff1a31fa90b52cefb2
guid: acdefb31f22c752ac90ddf2bf056e45c
MonoImporter:
externalObjects: {}
serializedVersion: 2
......
Assets/Scripts/GUI/Dialog.cs
View file @ db2bb2a1
......@@ -14,7 +14,7 @@ public class Dialog : MonoBehaviour
// singleton
public static Dialog instance;
private void Awake()
private void Awake()
{
if (instance != null)
{
......@@ -46,33 +46,13 @@ public class Dialog : MonoBehaviour
this.dialog = 0;
string[] DialogsLvl1 = {
"Coucou",
"Je fais un test pour le niveau 1",
"Ca marche bien nan ?",
"Melvyn t moch",
"Valentin aussi",
"Raff est pas bo"
"Ach... Encore eine gute chournée dans mon fillage!",
"Ch'ai très enfie te me balader",
"Che defrai aller au Nord dans la forêt ja !",
"pour me déplacer, je dois utiliser mes muscles 'flèches directionnelles'"
};
this.ListDialogs.Add("start", DialogsLvl1);
string[] Dialogsraff = {
"Salut",
"cava ?",
"Je te mange tes morts"
};
this.ListDialogs.Add("pnj", Dialogsraff);
string[] DialogsTest = {
"Je fais un test",
"ca marche ? ou pas ?",
"bisous"
};
this.ListDialogs.Add("test", DialogsTest);
string[] boutiqueChaussure = {
"Je fous prendrais zes chauzzures en taille Zweiundvierzig Bitte !",
......@@ -127,19 +107,7 @@ public class Dialog : MonoBehaviour
if ((Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown("joystick button 0")) && dialogActive)
this.Next();
// DEBUG
if ((Input.GetKeyDown(KeyCode.H) || Input.GetKeyDown("joystick button 1")))
this.dialogActive = !this.dialogActive;
// DEBUG
if (Input.GetKeyDown(KeyCode.F))
{
Debug.Log("tut");
this.setSituation("marchand");
}
if(this.dialogActive)
if (this.dialogActive)
{
this.dialogBox.GetComponent<CanvasRenderer>().SetAlpha(1f);
this.dialogText.GetComponent<CanvasRenderer>().SetAlpha(1f);
......
Assets/Scripts/GUI/PanneauDisplay.cs 0 → 100644
View file @ db2bb2a1
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
public class PanneauDisplay : MonoBehaviour
{
public string TextToDisplay = "Ceci est le texte de base du panneau";
public GameObject backgroundPanelDisplay;
public GameObject textPanelDisplay;
// Start is called before the first frame update
void Start()
{
backgroundPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
textPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
// Update is called once per frame
void Update()
{
}
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Player"))
{
textPanelDisplay.GetComponent<Text>().text = TextToDisplay;
backgroundPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(1f);
textPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(1f);
}
}
private void OnTriggerExit2D(Collider2D collision)
{
if (collision.CompareTag("Player"))
{
backgroundPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
textPanelDisplay.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
}
}
Assets/Scenes/Niveau2.unity.meta → Assets/Scripts/GUI/PanneauDisplay.cs.meta
View file @ db2bb2a1
fileFormatVersion: 2
guid: 4ae30febc4f91474fa9164b85521aaf5
DefaultImporter:
guid: 4c8875f970794c24fb1d22c9a0d2bb56
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/Game/GenerateMap.cs
View file @ db2bb2a1
......@@ -26,6 +26,10 @@ public class GenerateMap : MonoBehaviour
public GameObject textE;
public GameObject textEObject;
public GameObject GO_Panneau;
public GameObject displayBox;
public GameObject displayText;
//Les coordonées x dans l'ordre
......@@ -121,6 +125,11 @@ public class GenerateMap : MonoBehaviour
float x = shop.transform.position.x + xOffset;
float y = shop.transform.position.y + yOffset;
Instantiate(goToSell, new Vector3(x, y, 0), Quaternion.identity);
GameObject panneau = Instantiate(GO_Panneau, new Vector3(shop.transform.position.x +5.5f, shop.transform.position.y + 2.48f, 0), Quaternion.identity);
panneau.GetComponent<PanneauDisplay>().textPanelDisplay = displayText;
panneau.GetComponent<PanneauDisplay>().backgroundPanelDisplay = displayBox;
panneau.GetComponent<PanneauDisplay>().TextToDisplay = "Boutique de "+itemToSell.nom;
}
else
Debug.LogError("Mauvais paramètre pour objetVente: "+ objetVente);
......
Assets/Scripts/Inventory/Border.cs
View file @ db2bb2a1
......@@ -7,6 +7,7 @@ public class Border : MonoBehaviour
public Item itemNeeded;
public BoxCollider2D forestCollider;
private void OnCollisionEnter2D(Collision2D collision)
{
if (collision.transform.CompareTag("Player"))
......@@ -15,13 +16,15 @@ public class Border : MonoBehaviour
Debug.Log("JE TOUCHE LA BORDEER");
if (Inventory.instance.hasItem(itemNeeded))
{
Debug.Log("Je possde l'item ncessaire");
Debug.Log("Je poss?de l'item n?cessaire");
GameObject player = GameObject.FindGameObjectWithTag("Player");
//Debug.Log(player.GetComponent<PlayerMovement>().ispassed[itemNeeded.id - 1]);
player.GetComponent<PlayerMovement>().ispassed[itemNeeded.id - 1] = true;
forestCollider.enabled = false;
}
else
{
Debug.Log("Je n'ai pas l'item ncessaire");
Debug.Log("Je n'ai pas l'item n?cessaire");
switch (itemNeeded.id)
{
......@@ -35,7 +38,7 @@ public class Border : MonoBehaviour
Dialog.instance.setSituation("borderRechaud");
break;
case 4:
Dialog.instance.setSituation("borderTente");
Dialog.instance.setSituation("borderTente");
break;
}
}
......
Assets/Scripts/Player/PlayerMovement.cs
View file @ db2bb2a1
......@@ -15,10 +15,12 @@ public class PlayerMovement : MonoBehaviour
{
public float speed;
private Rigidbody2D myRigidbody;
private Vector3 change;
private Vector2 moveDirection;
private Animator animator;
public PlayerState currentState;
public GameObject player;
public bool[] ispassed;
public int stage;
// Start is called before the first frame update
void Start()
......@@ -27,45 +29,51 @@ public class PlayerMovement : MonoBehaviour
animator = GetComponent<Animator>();
myRigidbody = GetComponent<Rigidbody2D>();
animator.SetFloat("moveX", 0);
animator.SetFloat("moveY", -1);
ispassed = new bool[] { false, false, false, false };
stage = 0;
}
// Update is called once per frame
void Update()
{
change = Vector3.zero;
change.x = Input.GetAxisRaw("Horizontal");
change.y = Input.GetAxisRaw("Vertical");
ProcessInputs();
if(currentState == PlayerState.walk)
{
UpdateAnimationAndMove();
}
Vector3 pos = Camera.main.WorldToViewportPoint(transform.position);
pos.x = Mathf.Clamp01(pos.x);
pos.y = Mathf.Clamp01(pos.y);
transform.position = Camera.main.ViewportToWorldPoint(pos);
gameIntelligence();
}
private void FixedUpdate()
{
moveDirection.Normalize();
myRigidbody.velocity = new Vector2(moveDirection.x * speed, moveDirection.y * speed);
}
void MoveCharacter()
private void ProcessInputs()
{
change.Normalize();
myRigidbody.MovePosition(transform.position + change * speed * Time.deltaTime);
float moveX = Input.GetAxisRaw("Horizontal");
float moveY = Input.GetAxisRaw("Vertical");
moveDirection = new Vector2(moveX, moveY);
}
void UpdateAnimationAndMove()
{
if (change != Vector3.zero)
if (moveDirection != Vector2.zero)
{
MoveCharacter();
animator.SetFloat("moveX", change.x);
animator.SetFloat("moveY", change.y);
animator.SetFloat("moveX", moveDirection.x);
animator.SetFloat("moveY", moveDirection.y);
animator.SetBool("moving", true);
}
......@@ -74,4 +82,48 @@ public class PlayerMovement : MonoBehaviour
animator.SetBool("moving", false);
}
}
void gameIntelligence()
{
if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 0)
{
GenerateMap.instance.generateBoutique(0, 0, "chaussure");
stage++;
}
else if (stage == 1 && ispassed[0] == true)
{
GenerateMap.instance.generateUsine(0, 1);
stage++;
}
else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 2)
{
GenerateMap.instance.generateBoutique(0, 2, "baton");
stage++;
}
else if (stage == 3 && ispassed[1] == true)
{
GenerateMap.instance.generateUsine(1, 1);
stage++;
}
else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 4)
{
GenerateMap.instance.generateBoutique(1, 2, "rechaud");
stage++;
}
else if (stage == 5 && ispassed[2] == true)
{
GenerateMap.instance.generateUsine(2, 0);
stage++;
}
else if (this.GetComponent<PlayerNature>().currentNature >= 100 && stage == 6)
{
GenerateMap.instance.generateBoutique(2, 1, "tente");
stage++;
}
else if (stage == 7 && ispassed[3] == true)
{
GenerateMap.instance.generateUsine(1, 0);
//stage++;
}
}
}
Assets/Scripts/Player/PlayerNature.cs
View file @ db2bb2a1
......@@ -69,6 +69,9 @@ public class PlayerNature : MonoBehaviour
{
this.currentNature += bonus;
if (this.currentNature >= 100)
this.currentNature = 100;
this.natureBar.SetValue(this.currentNature);
}
......
Assets/Scripts/Scene/loadScene.cs
View file @ db2bb2a1
......@@ -31,7 +31,7 @@ public class loadScene : MonoBehaviour
SceneManager.LoadScene(scene);
}
......@@ -42,11 +42,6 @@ public class loadScene : MonoBehaviour
// Update is called once per frame
void Update()
{
if(PlayerNature.instance.currentNature <= 0)
{
ChargerScene();
PlayerNature.instance.currentNature = 100;
}
}
public void ExitGame()
......
Assets/Scenes/Niveau1.unity.meta → Assets/Scripts/Shop.meta
View file @ db2bb2a1
fileFormatVersion: 2
guid: 2cda990e2423bbf4892e6590ba056729
guid: 1d113792a68e92533a5ae096013dedfd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
......
Assets/Shopping.cs → Assets/Scripts/Shop/Shopping.cs
View file @ db2bb2a1
......@@ -7,7 +7,7 @@ public class Shopping : MonoBehaviour
{
private bool playerInRange;
private bool isBuy=false;
private bool isBuy = false;
public Item sellItem = null;
//public GameObject[] itemForSale = new GameObject[2];
public List<GameObject> itemForSale = new List<GameObject>();
......@@ -27,57 +27,61 @@ public class Shopping : MonoBehaviour
Ebutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
textEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
textEbuttonObject.GetComponent<CanvasRenderer>().SetAlpha(0f);
}
// Update is called once per frame
void Update()
{
if(playerInRange)
if (playerInRange)
{
switch (sellItem.id)
{
case 1:
textEbuttonObject.GetComponent<Text>().text="Chaussures de marche";
textEbuttonObject.GetComponent<Text>().text = "Chaussures de marche";
break;
case 2:
textEbuttonObject.GetComponent<Text>().text="Bâton de marche";
textEbuttonObject.GetComponent<Text>().text = "Bâton de marche";
break;
case 3:
textEbuttonObject.GetComponent<Text>().text="Réchaud";
textEbuttonObject.GetComponent<Text>().text = "Réchaud";
break;
case 4:
textEbuttonObject.GetComponent<Text>().text="Tente";
textEbuttonObject.GetComponent<Text>().text = "Tente";
break;
}
}
if (Input.GetKeyDown(KeyCode.E) && playerInRange && sellItem && itemForSale.Count>0)
if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown("joystick button 1")) && playerInRange && sellItem && itemForSale.Count > 0)
{
if (!isBuy)
PlayerNature.instance.LooseNature(20);
switch (sellItem.id)
{
case 1:
Dialog.instance.setSituation("boutiqueChaussure");
isBuy=true;
isBuy = true;
break;
case 2:
Dialog.instance.setSituation("boutiqueBaton");
isBuy=true;
isBuy = true;
break;
case 3:
Dialog.instance.setSituation("boutiqueRechaud");
isBuy=true;
isBuy = true;
break;
case 4:
Dialog.instance.setSituation("boutiqueTente");
isBuy=true;
isBuy = true;
break;
}
panelEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
Ebutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
textEbutton.GetComponent<CanvasRenderer>().SetAlpha(0f);
textEbuttonObject.GetComponent<CanvasRenderer>().SetAlpha(0f);
Inventory.instance.addItem(sellItem);
Debug.Log(sellItem.name.ToString() + " a bien ete ajouté a l'inventaire");
}
......@@ -88,14 +92,14 @@ public class Shopping : MonoBehaviour
if (collision.CompareTag("Player"))
{
playerInRange = true;
if(isBuy==false)
if (isBuy == false)
{
panelEbutton.GetComponent<CanvasRenderer>().SetAlpha(1f);
Ebutton.GetComponent<CanvasRenderer>().SetAlpha(1f);
textEbutton.GetComponent<CanvasRenderer>().SetAlpha(1f);
textEbuttonObject.GetComponent<CanvasRenderer>().SetAlpha(1f);
}
}
}
......
Assets/Shopping.cs.meta → Assets/Scripts/Shop/Shopping.cs.meta
View file @ db2bb2a1
fileFormatVersion: 2
guid: b0d67e78638d146bd8a6878c5027f9c5
guid: 3aca29e63a372841dabe9b809fff6d12
MonoImporter:
externalObjects: {}
serializedVersion: 2
......
Build/LinuxPlayer_s.debug 0 → 100755
View file @ db2bb2a1
File added
Build/UnityPlayer.so 0 → 100755
View file @ db2bb2a1
File added
Build/UnityPlayer_s.debug 0 → 100755
View file @ db2bb2a1
File added
Build/launch.x86_64 0 → 100755
View file @ db2bb2a1
File added
Build/launch_Data/Managed/Assembly-CSharp.dll 0 → 100644
View file @ db2bb2a1
File added