diff --git a/Maquette/Assets/Loot.cs b/Maquette/Assets/Loot.cs
index f453f1bf38f6e8465f2ba01170c8ebfd7d32c3eb..426b83202751608e87cfab28915e7278206546e1 100644
--- a/Maquette/Assets/Loot.cs
+++ b/Maquette/Assets/Loot.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
@@ -7,7 +7,6 @@ public class Loot : MonoBehaviour
{
public Gun.GunName gunName;
public int value;
- //public Transform roomCanvas;
public WeaponData weapons;
// Start is called before the first frame update
diff --git a/Maquette/Assets/Scenes/Salle1.unity b/Maquette/Assets/Scenes/Salle1.unity
index 83f4ad4f13af9369028d99387c85fddaf402c3e1..2b7ec5e92260f745179e548b5d37934699c6e00e 100644
--- a/Maquette/Assets/Scenes/Salle1.unity
+++ b/Maquette/Assets/Scenes/Salle1.unity
@@ -160,6 +160,7 @@ Transform:
- {fileID: 177982805}
- {fileID: 1578300495}
- {fileID: 1888066317}
+ - {fileID: 199434770}
m_Father: {fileID: 1107132249}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -636,8 +637,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 348, y: -101}
- m_SizeDelta: {x: 78.954605, y: 83.25331}
+ m_AnchoredPosition: {x: -400, y: -64}
+ m_SizeDelta: {x: 63.335968, y: 67.395966}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &177982804
GameObject:
@@ -740,7 +741,37 @@ MonoBehaviour:
weapon_loot: {fileID: 3075358178863567138, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
roomCanvas: {fileID: 0}
- animator: {fileID: 76975901}
+ animator: {fileID: 0}
+--- !u!1 &199434769
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 199434770}
+ m_Layer: 10
+ m_Name: ItemsBobby
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &199434770
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 199434769}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 76975893}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &225478090
GameObject:
m_ObjectHideFlags: 0
@@ -1046,7 +1077,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 394421608}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
- m_LocalPosition: {x: 0, y: 0, z: 2.0001466}
+ m_LocalPosition: {x: 0, y: 0, z: 2.0000534}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1371749973}
@@ -1054,10 +1085,10 @@ RectTransform:
m_Father: {fileID: 1372233035}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
- m_AnchorMin: {x: 0, y: 1}
- m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 67, y: -203}
- m_SizeDelta: {x: 273.2563, y: 65.548904}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 397, y: 95}
+ m_SizeDelta: {x: 210, y: 55}
m_Pivot: {x: 0.49999997, y: 0.49999994}
--- !u!1 &407788999
GameObject:
@@ -1224,7 +1255,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5.5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -1415,7 +1446,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 661256183}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 2.28, y: -2.94, z: 93.341064}
+ m_LocalPosition: {x: -0.73, y: 2.15, z: 93.341064}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_Children:
- {fileID: 458278266}
@@ -1647,7 +1678,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0.000061035156}
+ m_AnchoredPosition: {x: 0, y: 0.00006866455}
m_SizeDelta: {x: -15.146027, y: 0.000076293945}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &734422012
@@ -1921,8 +1952,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 348, y: 50}
- m_SizeDelta: {x: 265.66263, y: 60.650536}
+ m_AnchoredPosition: {x: -400, y: 72}
+ m_SizeDelta: {x: 210, y: 55}
m_Pivot: {x: 0.5, y: 0.49999997}
--- !u!1001 &1052943213
PrefabInstance:
@@ -2425,7 +2456,232 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
- - first: {x: 13, y: -10, z: 0}
+ - first: {x: -13, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -12, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -11, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -10, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -9, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -8, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -7, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -6, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -5, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -3, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -2, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -1, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 0, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 1, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 2, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 3, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 4, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 5, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 6, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 7, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 8, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 9, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 10, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 11, y: -6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: -5, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
@@ -2641,6 +2897,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: -5, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: -4, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: -4, z: 0}
second:
serializedVersion: 2
@@ -2848,7 +3122,7 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
- - first: {x: -12, y: -3, z: 0}
+ - first: {x: 11, y: -4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
@@ -2857,7 +3131,7 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
- - first: {x: -11, y: -3, z: 0}
+ - first: {x: -13, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
@@ -2866,7 +3140,7 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
- - first: {x: -10, y: -3, z: 0}
+ - first: {x: -12, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
@@ -2875,16 +3149,34 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
- - first: {x: -9, y: -3, z: 0}
+ - first: {x: -11, y: -3, z: 0}
second:
serializedVersion: 2
- m_TileIndex: 5
- m_TileSpriteIndex: 5
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
- - first: {x: -8, y: -3, z: 0}
+ - first: {x: -10, y: -3, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -9, y: -3, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 5
+ m_TileSpriteIndex: 5
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -8, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 0
@@ -3055,6 +3347,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: -3, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: -2, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: -2, z: 0}
second:
serializedVersion: 2
@@ -3262,6 +3572,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: -2, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: -1, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: -1, z: 0}
second:
serializedVersion: 2
@@ -3469,6 +3797,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: -1, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: 0, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: 0, z: 0}
second:
serializedVersion: 2
@@ -3676,6 +4022,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: 0, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: 1, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: 1, z: 0}
second:
serializedVersion: 2
@@ -3883,6 +4247,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: 1, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: 2, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: 2, z: 0}
second:
serializedVersion: 2
@@ -4090,6 +4472,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: 2, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: 3, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: 3, z: 0}
second:
serializedVersion: 2
@@ -4297,6 +4697,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: 3, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: 4, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: 4, z: 0}
second:
serializedVersion: 2
@@ -4504,6 +4922,24 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: 4, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: 5, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
- first: {x: -12, y: 5, z: 0}
second:
serializedVersion: 2
@@ -4711,6 +5147,240 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
m_AllTileFlags: 1073741825
+ - first: {x: 11, y: 5, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -13, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -12, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -11, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -10, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -9, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -8, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -7, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -6, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -5, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -4, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -3, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -2, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: -1, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 0, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 1, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 2, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 3, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 4, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 5, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 6, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 7, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 8, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 9, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 10, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
+ - first: {x: 11, y: 6, z: 0}
+ second:
+ serializedVersion: 2
+ m_TileIndex: 14
+ m_TileSpriteIndex: 7
+ m_TileMatrixIndex: 0
+ m_TileColorIndex: 0
+ m_TileObjectToInstantiateIndex: 65535
+ m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 114
@@ -4741,7 +5411,7 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 6655cb60528d34c4e8ccfc824e343b88, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e1db8164039f0ea4c97810b41fdf34b7, type: 2}
- - m_RefCount: 70
+ - m_RefCount: 141
m_Data: {fileID: 11400000, guid: 6454cde4d90bfeb48844da5c5eb08985, type: 2}
m_TileSpriteArray:
- m_RefCount: 114
@@ -4765,7 +5435,7 @@ Tilemap:
- m_RefCount: 15
m_Data: {fileID: 7751083521641134979, guid: 27dec0839fc8d4e49a8fdc0136eeebd3,
type: 3}
- - m_RefCount: 70
+ - m_RefCount: 141
m_Data: {fileID: -3260064126374222814, guid: 27dec0839fc8d4e49a8fdc0136eeebd3,
type: 3}
- m_RefCount: 9
@@ -4790,7 +5460,7 @@ Tilemap:
m_Data: {fileID: 8759630951382346469, guid: 27dec0839fc8d4e49a8fdc0136eeebd3,
type: 3}
m_TileMatrixArray:
- - m_RefCount: 257
+ - m_RefCount: 328
m_Data:
e00: 1
e01: 0
@@ -4809,13 +5479,13 @@ Tilemap:
e32: 0
e33: 1
m_TileColorArray:
- - m_RefCount: 257
+ - m_RefCount: 328
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -39, y: -16, z: 0}
- m_Size: {x: 55, y: 22, z: 1}
+ m_Size: {x: 55, y: 23, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@@ -4970,7 +5640,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0.000061035156}
+ m_AnchoredPosition: {x: -0.000030517578, y: 0.000061035156}
m_SizeDelta: {x: -15.146027, y: 0.000076293945}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1371749974
@@ -5214,8 +5884,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -333, y: -110.31}
- m_SizeDelta: {x: 202.43314, y: 220.61801}
+ m_AnchoredPosition: {x: 397, y: -64}
+ m_SizeDelta: {x: 163.02585, y: 177.67072}
m_Pivot: {x: 0.50000006, y: 0.5}
--- !u!1 &1528629698
GameObject:
@@ -5600,7 +6270,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
- m_Alignment: 0
+ m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -5631,8 +6301,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 359.27, y: -150.47}
- m_SizeDelta: {x: 73.08948, y: 61.87037}
+ m_AnchoredPosition: {x: -400, y: -121.5}
+ m_SizeDelta: {x: 56.2, y: 47.6}
m_Pivot: {x: 0.49999997, y: 0.5}
--- !u!1 &2091200589
GameObject:
@@ -5678,7 +6348,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 40
- m_Alignment: 0
+ m_Alignment: 1
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@@ -5709,8 +6379,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -327, y: -152}
- m_SizeDelta: {x: 65.9498, y: 58.81349}
+ m_AnchoredPosition: {x: 397, y: -129.04}
+ m_SizeDelta: {x: 57.562756, y: 47.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &2093286427 stripped
RectTransform:
diff --git a/Maquette/Assets/Scripts/LifeBobby.cs b/Maquette/Assets/Scripts/LifeBobby.cs
index 406b7d59b602632922d63c1734b352e968c426e7..fd175f3afb41e481037629c4329d7c80e0204070 100644
--- a/Maquette/Assets/Scripts/LifeBobby.cs
+++ b/Maquette/Assets/Scripts/LifeBobby.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -46,7 +46,7 @@ public class LifeBobby : MonoBehaviour
}
}
- private void AlterLife(int alteration) {
+ public void AlterLife(int alteration) {
count_life += alteration;
if(count_life >= maxHealth){
healthBar.setHealth(maxHealth);
@@ -57,3 +57,4 @@ public class LifeBobby : MonoBehaviour
}
}
+
diff --git a/Maquette/Assets/Scripts/LifeClyde.cs b/Maquette/Assets/Scripts/LifeClyde.cs
index d381a68049dc7b1264fb2c7338acefa2be89e653..58226e65c098cd9f36425b91a173ea6a56bf3507 100644
--- a/Maquette/Assets/Scripts/LifeClyde.cs
+++ b/Maquette/Assets/Scripts/LifeClyde.cs
@@ -27,10 +27,12 @@ public class LifeClyde : MonoBehaviour
void OnTriggerEnter2D (Collider2D Target){
if(Target.tag == "DamageMaker"){
LoseLife(Target.GetComponent<damageMaker>().damage);
+
}
if(Target.tag == "LifeUp"){
AlterLife(20);
}
+
}
diff --git a/Maquette/Assets/Scripts/LifeVillain.cs b/Maquette/Assets/Scripts/LifeVillain.cs
index 759d90d20a87c5361a6198fc5c71bc79af74410e..c66cccd0cdabd744fc3f72687c8773fca933517b 100644
--- a/Maquette/Assets/Scripts/LifeVillain.cs
+++ b/Maquette/Assets/Scripts/LifeVillain.cs
@@ -40,14 +40,14 @@ public class LifeVillain : MonoBehaviour
}
/*
if(Target.tag == "Bullet"){
- LoseLife(10);
+ LoseLife(5);
}
if(Target.tag == "Plomb" && count_life > 0){
LoseLife(5);
}
if(Target.tag == "Explosion"){
- LoseLife(300);
+ LoseLife(40);
}
*/
}