From 08dfcb02a51b9a73f37e5f9096a1fe032eff4995 Mon Sep 17 00:00:00 2001
From: GIMENEZ TANGUY <tanguy.gimenez@etu.unistra.fr>
Date: Wed, 31 Mar 2021 09:35:18 +0200
Subject: [PATCH] Revert "Merge branch 'master' into 'master'"
This reverts merge request !79
---
Assets/Scenes/sceneRaffael.unity | 4 ++--
Assets/Scripts/Player/PlayerNature.cs | 4 ++--
Assets/Shopping.cs | 1 -
ProjectSettings/EditorBuildSettings.asset | 8 ++++----
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Assets/Scenes/sceneRaffael.unity b/Assets/Scenes/sceneRaffael.unity
index dd7315a..3b6bc90 100644
--- a/Assets/Scenes/sceneRaffael.unity
+++ b/Assets/Scenes/sceneRaffael.unity
@@ -5596,7 +5596,7 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: -11.424435, y: -7.6097336}
+ m_Offset: {x: -11.424435, y: -9.144066}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
@@ -5607,7 +5607,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 49.0467, y: 4.449005}
+ m_Size: {x: 49.0467, y: 7.5176697}
m_EdgeRadius: 0
--- !u!4 &1467294797 stripped
Transform:
diff --git a/Assets/Scripts/Player/PlayerNature.cs b/Assets/Scripts/Player/PlayerNature.cs
index f71f55c..29c9778 100644
--- a/Assets/Scripts/Player/PlayerNature.cs
+++ b/Assets/Scripts/Player/PlayerNature.cs
@@ -8,8 +8,6 @@ using System;
using System.Timers;
public class PlayerNature : MonoBehaviour
-
-
{
// l'instance de PlayerNature (pour un singleton)
@@ -41,6 +39,8 @@ public class PlayerNature : MonoBehaviour
}
+
+
void Update()
{
diff --git a/Assets/Shopping.cs b/Assets/Shopping.cs
index 2e70658..54ee399 100644
--- a/Assets/Shopping.cs
+++ b/Assets/Shopping.cs
@@ -55,7 +55,6 @@ public class Shopping : MonoBehaviour
if ((Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown("joystick button 1")) && playerInRange && sellItem && itemForSale.Count > 0)
{
- PlayerNature.instance.LooseNature(25);
switch (sellItem.id)
{
case 1:
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index d237ebf..008a07f 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -5,10 +5,10 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- - enabled: 0
+ - enabled: 1
path: Assets/Scenes/Niveau1.unity
guid: 2cda990e2423bbf4892e6590ba056729
- - enabled: 0
+ - enabled: 1
path: Assets/Scenes/Menu.unity
guid: 458707c07ba6b4b4297fc1de6ac38622
- enabled: 1
@@ -17,10 +17,10 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/sceneRaffael.unity
guid: bdf7662389bf8487c9a7909d08af8c3e
- - enabled: 0
+ - enabled: 1
path: Assets/Scenes/Valentin.unity
guid: 8c9ceab1c999ea749aa0fe2b0c87b0bf
- - enabled: 0
+ - enabled: 1
path: Assets/Scenes/Niveau2.unity
guid: 4ae30febc4f91474fa9164b85521aaf5
- enabled: 1
--
GitLab