diff --git a/Maquette/Assets/Carpet.prefab b/Maquette/Assets/Carpet.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..08c996fc498350f4cd03b39bd8917356a819792e
--- /dev/null
+++ b/Maquette/Assets/Carpet.prefab
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1998599832797129962
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1998599832797129960}
+ - component: {fileID: 1998599832797129963}
+ m_Layer: 0
+ m_Name: Carpet
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1998599832797129960
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1998599832797129962}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 2.57, y: -0.15, z: -1}
+ m_LocalScale: {x: 1.1962553, y: 1.1962553, z: 1.1962553}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1998599832797129963
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1998599832797129962}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: 7a39d5cf148056c4c9deeb699388e295, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1.7, y: 1.7}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
diff --git a/Maquette/Assets/Carpet.prefab.meta b/Maquette/Assets/Carpet.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..9e3712fc96765fe6c9ab019dce278c348637d2b0
--- /dev/null
+++ b/Maquette/Assets/Carpet.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3981b243536f7f44c9fe91b4441d85a1
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/DmgBonus.prefab b/Maquette/Assets/DmgBonus.prefab
index df589b8d0ba2f7fa32d21a09e287f3bd6ca2bfee..c18964a8859ed9b43dc9caca850ad908bfb9c1f4 100644
--- a/Maquette/Assets/DmgBonus.prefab
+++ b/Maquette/Assets/DmgBonus.prefab
@@ -107,7 +107,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8, y: 8.11}
+ m_Size: {x: 11, y: 11}
m_EdgeRadius: 0
--- !u!114 &1027322918830954500
MonoBehaviour:
diff --git a/Maquette/Assets/Kamikaze.cs b/Maquette/Assets/Kamikaze.cs
new file mode 100644
index 0000000000000000000000000000000000000000..5908b5274d9024f297784157b43f8261a42e505f
--- /dev/null
+++ b/Maquette/Assets/Kamikaze.cs
@@ -0,0 +1,88 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+/*
+void Ininialize(Kamikaze kamikaze, String B, String C) {
+ kamikaze.Bobby = GameObject.Find(B);
+ kamikaze.Clyde = GameObject.Find(C);
+}
+*/
+
+public class Kamikaze : MonoBehaviour
+{
+ public float speed = 1.0f;
+ public float erratisme = 1.0f;
+ public Rigidbody2D body;
+ public GameObject Bobby;
+ public GameObject Clyde;
+ float angle = 0;
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ Bobby = GameObject.Find("Bobby");
+ Clyde = GameObject.Find("Clyde");
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+ ChasePlayer();
+ }
+
+ private void ChasePlayer() {
+ Vector2 direction;
+ Vector2 direction1;
+ Vector2 direction2;
+ body.bodyType = RigidbodyType2D.Dynamic; // Able to move.
+
+ // distance to Bobby
+ if (Bobby != null){ // Bobby is alive
+ direction1 = (Bobby.transform.position - transform.position);
+ }
+ else { // Bobby is dead
+ direction1 = Vector2.zero;
+ }
+
+ //distance to clyde
+ if (Clyde != null){ // Clyde is alive
+ direction2 = (Clyde.transform.position - transform.position);
+ }
+ else { // Clyde is dead
+ direction2 = Vector2.zero;
+ }
+
+ //we chase the closest guy
+
+ if (direction1.magnitude < direction2.magnitude && direction1 != Vector2.zero || direction2 == Vector2.zero){
+ direction = direction1.normalized;// Normalized mean length of vector is 1.
+ }
+ else{
+ direction = direction2.normalized;
+ }
+ float norme = direction.magnitude;
+ Vector2 perturbation = new Vector2(Random.Range(-1.0f, 1.0f), Random.Range(-1.0f, 1.0f));
+ perturbation = perturbation.normalized;
+ Vector2 directionPerturbee = direction + perturbation*norme*erratisme;
+ directionPerturbee = directionPerturbee.normalized;
+ body.velocity = directionPerturbee * speed;
+
+ //make the guy turn around
+ if(direction != Vector2.zero){
+ angle = Vector2.Angle(direction, Vector2.right);
+ }
+ if(direction.y < 0){
+ angle = - angle;
+ }
+ body.MoveRotation(Quaternion.Euler(0, 0, angle));
+ }
+
+ // Autodestruction
+ void OnTriggerEnter2D (Collider2D Target){
+ if (Target.tag == "Bobby" || Target.tag == "Clyde" || Target.tag == "Bullet" || Target.tag == "Explosion") {
+ Destroy(gameObject);
+ }
+ }
+
+}
diff --git a/Maquette/Assets/Kamikaze.cs.meta b/Maquette/Assets/Kamikaze.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f3ee1c5afa17ecfdc06f9f2247e2ec97ff653782
--- /dev/null
+++ b/Maquette/Assets/Kamikaze.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fb207ec1f91397c4e981c7a3930d9b18
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Kamikaze.prefab b/Maquette/Assets/Kamikaze.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..357c72b9d772f0aabff3cf8185d06145c6aec36b
--- /dev/null
+++ b/Maquette/Assets/Kamikaze.prefab
@@ -0,0 +1,164 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1847200226376073621
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1847200226376073630}
+ - component: {fileID: 1847200226376073617}
+ - component: {fileID: 1847200226376073616}
+ - component: {fileID: 1847200226376073619}
+ - component: {fileID: 1847200226376073618}
+ - component: {fileID: 1847200226376073631}
+ m_Layer: 0
+ m_Name: Kamikaze
+ m_TagString: DamageMaker
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 4294967295
+ m_IsActive: 1
+--- !u!4 &1847200226376073630
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847200226376073621}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 2.576157, y: -0.46150538, z: -2}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &1847200226376073617
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847200226376073621}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: 510859e199ecbd44c9c8dcf8473433dd, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 0.9, y: 0.7}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!61 &1847200226376073616
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847200226376073621}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 0.7, y: 0.9}
+ newSize: {x: 0.9, y: 0.7}
+ adaptiveTilingThreshold: 0.5
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 0.9, y: 0.7}
+ m_EdgeRadius: 0
+--- !u!114 &1847200226376073619
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847200226376073621}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fb207ec1f91397c4e981c7a3930d9b18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ speed: 2
+ erratisme: 1
+ body: {fileID: 1847200226376073618}
+ Bobby: {fileID: 0}
+ Clyde: {fileID: 0}
+--- !u!50 &1847200226376073618
+Rigidbody2D:
+ serializedVersion: 4
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847200226376073621}
+ m_BodyType: 0
+ m_Simulated: 1
+ m_UseFullKinematicContacts: 0
+ m_UseAutoMass: 0
+ m_Mass: 1
+ m_LinearDrag: 0
+ m_AngularDrag: 0.05
+ m_GravityScale: 1
+ m_Material: {fileID: 0}
+ m_Interpolate: 0
+ m_SleepingMode: 1
+ m_CollisionDetection: 0
+ m_Constraints: 0
+--- !u!114 &1847200226376073631
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847200226376073621}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 6d656c2313fe943a4ada8a7237fc838b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ damage: 10
diff --git a/Maquette/Assets/Kamikaze.prefab.meta b/Maquette/Assets/Kamikaze.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fb6a16a2922078d1cb5451d34a8554f3405bea9e
--- /dev/null
+++ b/Maquette/Assets/Kamikaze.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 260cded7245744342bd2b83e5c3db0af
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/LifeBonus.prefab b/Maquette/Assets/LifeBonus.prefab
index 53013997041f9a4595c370ea17b18d2e47cf5264..46a0562cfaf6e1bb13e403d4203b731ad3cd2ef0 100644
--- a/Maquette/Assets/LifeBonus.prefab
+++ b/Maquette/Assets/LifeBonus.prefab
@@ -57,7 +57,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8, y: 8.11}
+ m_Size: {x: 11, y: 11}
m_EdgeRadius: 0
--- !u!212 &216797475059410421
SpriteRenderer:
diff --git a/Maquette/Assets/LifeUp.prefab b/Maquette/Assets/LifeUp.prefab
index a9865fe86c6818da7c00a82cadcab4d53d28e43c..b62a8e0273ecd1bd399294cc3e3fa107993af3c2 100644
--- a/Maquette/Assets/LifeUp.prefab
+++ b/Maquette/Assets/LifeUp.prefab
@@ -119,5 +119,5 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8, y: 8.11}
+ m_Size: {x: 10, y: 10}
m_EdgeRadius: 0
diff --git a/Maquette/Assets/Loot.cs b/Maquette/Assets/Loot.cs
index 426b83202751608e87cfab28915e7278206546e1..88d90c6139d365ff1563efedaa7db0f2aa0b5d41 100644
--- a/Maquette/Assets/Loot.cs
+++ b/Maquette/Assets/Loot.cs
@@ -45,7 +45,7 @@ public class Loot : MonoBehaviour
Target.GetComponent<CashClyde>().ChangeCash(-value);
WeaponClyde.instance.ChangeWeapon(gunName);
Destroy(gameObject);
- }
+ }
}
}
}
diff --git a/Maquette/Assets/RateBonus.prefab b/Maquette/Assets/RateBonus.prefab
index 3c331dd12732127ac6ace919f1e3dccef588b59d..36fbeced64e5901e91d9c069d666f77fc7b688a0 100644
--- a/Maquette/Assets/RateBonus.prefab
+++ b/Maquette/Assets/RateBonus.prefab
@@ -107,7 +107,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8, y: 8.11}
+ m_Size: {x: 11, y: 11}
m_EdgeRadius: 0
--- !u!114 &5758036818848323920
MonoBehaviour:
diff --git a/Maquette/Assets/Scenes/Salle1.unity b/Maquette/Assets/Scenes/Salle1.unity
index b9b754bce7ad7d1fb620ff65428f5ddedd22fdb9..13e186e921201da434ecece3afe125625f70416f 100644
--- a/Maquette/Assets/Scenes/Salle1.unity
+++ b/Maquette/Assets/Scenes/Salle1.unity
@@ -439,7 +439,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
propertyPath: m_AnchoredPosition.x
- value: -1.49
+ value: -1.4900017
objectReference: {fileID: 0}
- target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
propertyPath: m_SizeDelta.x
@@ -518,12 +518,12 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -107.1
+ value: -110
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 3.3
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -798,7 +798,7 @@ 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: 360, y: 50}
+ m_AnchoredPosition: {x: 350, y: 50}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &187543950
@@ -963,7 +963,7 @@ 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: 360, y: 0}
+ m_AnchoredPosition: {x: 350, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &254635126
@@ -1107,7 +1107,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &370445320
GameObject:
@@ -1630,7 +1630,7 @@ 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: 360, y: 25}
+ m_AnchoredPosition: {x: 350, y: 25}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &617007955
@@ -2005,7 +2005,7 @@ Transform:
- {fileID: 1624791555}
- {fileID: 292083826}
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &734422010
GameObject:
@@ -2090,7 +2090,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0.0000027725
+ value: 0.0000038146973
objectReference: {fileID: 0}
- target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
propertyPath: m_AnchoredPosition.y
@@ -2107,7 +2107,7 @@ PrefabInstance:
- target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: gunName
- value: 2
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -2177,7 +2177,7 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 89
+ value: 110
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -2217,7 +2217,7 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_Pivot.x
- value: 0.5
+ value: 0.50000006
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -2369,7 +2369,7 @@ 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: -360, y: 25}
+ m_AnchoredPosition: {x: -350, y: 25}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1035733755
@@ -2423,12 +2423,12 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.x
- value: -0.25991955
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.13689923
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -2458,7 +2458,7 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -2538,7 +2538,7 @@ Transform:
- {fileID: 76975893}
- {fileID: 661256184}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1117914251
GameObject:
@@ -2574,8 +2574,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: -360, y: 0}
- m_SizeDelta: {x: 100, y: 100}
+ m_AnchoredPosition: {x: -350, y: 0}
+ m_SizeDelta: {x: 100, y: 115.3739}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1117914253
MonoBehaviour:
@@ -2721,75 +2721,6 @@ MonoBehaviour:
roomCanvas: {fileID: 0}
animator: {fileID: 661256192}
isBurning: 0
---- !u!1001 &1297792225
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 1.8876959
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.098424196
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_RootOrder
- value: 6
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296156, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_Name
- value: Table (1)
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 8f7972a78d9a542eaa496b0caedd62d1, type: 3}
--- !u!1 &1308257689
GameObject:
m_ObjectHideFlags: 0
@@ -6148,13 +6079,82 @@ RectTransform:
- {fileID: 99931545}
- {fileID: 2093286427}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 6
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}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1001 &1369127515
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129962, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_Name
+ value: Carpet (2)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
--- !u!1 &1371749972
GameObject:
m_ObjectHideFlags: 0
@@ -6745,6 +6745,75 @@ Transform:
m_Father: {fileID: 76975893}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1947714836
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 3.4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129962, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_Name
+ value: Carpet
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
--- !u!1 &1981471059
GameObject:
m_ObjectHideFlags: 0
@@ -6893,7 +6962,7 @@ 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: -360, y: 50}
+ m_AnchoredPosition: {x: -350, y: 50}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2004159441
@@ -6937,6 +7006,75 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2004159439}
m_CullTransparentMesh: 0
+--- !u!1001 &2015707599
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -3.4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129962, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_Name
+ value: Carpet (1)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
--- !u!1 &2071175229
GameObject:
m_ObjectHideFlags: 0
@@ -7179,12 +7317,12 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -36.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -84
+ value: -90
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -7228,141 +7366,3 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
---- !u!1001 &1147315489337022803
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -2.39
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: -0.1
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_RootOrder
- value: 5
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296130, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1147315488618296156, guid: 8f7972a78d9a542eaa496b0caedd62d1,
- type: 3}
- propertyPath: m_Name
- value: Table
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 8f7972a78d9a542eaa496b0caedd62d1, type: 3}
---- !u!1001 &5758036818264064069
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 5758036818848323921, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_Name
- value: RateBonus
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 3.14
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: -2.19
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -9.067989
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_RootOrder
- value: 8
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: c4889e42f2487ad4c92ee933c6c1ccc7, type: 3}
diff --git a/Maquette/Assets/Scenes/Salle2.unity b/Maquette/Assets/Scenes/Salle2.unity
index 2e80e10ecf1617b29498f62d6109d4dc24cc7b96..98ccbc3988e5bc60a6b8f224be84fab171ccea26 100644
--- a/Maquette/Assets/Scenes/Salle2.unity
+++ b/Maquette/Assets/Scenes/Salle2.unity
@@ -242,82 +242,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &409661541
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: -1.7642212
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: -1.3128904
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -3
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 0.1
- objectReference: {fileID: 0}
- - target: {fileID: 1027322918830954503, guid: f099597eb10e0f34ea13b3c1938855ff,
- type: 3}
- propertyPath: m_Name
- value: DmgBonus
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: f099597eb10e0f34ea13b3c1938855ff, type: 3}
--- !u!1 &530759358
GameObject:
m_ObjectHideFlags: 0
@@ -400,7 +326,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &530759362
MonoBehaviour:
@@ -3697,6 +3623,146 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
+--- !u!1 &766366279
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 766366284}
+ - component: {fileID: 766366283}
+ - component: {fileID: 766366282}
+ - component: {fileID: 766366281}
+ - component: {fileID: 766366280}
+ m_Layer: 0
+ m_Name: Spawner
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &766366280
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 766366279}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fc1d5e370cc1248349e134c8c240a132, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ villainPos: {fileID: 766366284}
+ DeadPlayer: {fileID: 0}
+ maxLife: 150
+ count_life: 0
+ healthBarPrefab: {fileID: 1583576606655007198, guid: 0928775468cc94adf858b69c5af59649,
+ type: 3}
+ healthBar: {fileID: 0}
+ LifeUp: {fileID: 1564419176581148229, guid: fc35b6f9278194b03b569c66ac46dcdc, type: 3}
+ cash: {fileID: 5902828749815425179, guid: f6d75766048fc427b976d42e8919bf84, type: 3}
+ roomCanvas: {fileID: 0}
+ offset: {x: 0, y: 0.5, z: 0}
+ kamikaze: {fileID: 1847200226376073621, guid: 260cded7245744342bd2b83e5c3db0af,
+ type: 3}
+--- !u!114 &766366281
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 766366279}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 51ed8449ac4536e439a38df212c0d04e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ duration: 3
+ Kamikaze: {fileID: 1847200226376073621, guid: 260cded7245744342bd2b83e5c3db0af,
+ type: 3}
+--- !u!58 &766366282
+CircleCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 766366279}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_UsedByComposite: 0
+ m_Offset: {x: 0, y: 0}
+ serializedVersion: 2
+ m_Radius: 0.6
+--- !u!212 &766366283
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 766366279}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: faf5112cd55973140bb6820db7e10a09, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 1.2, y: 1.2}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &766366284
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 766366279}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 5.77, y: -3.01, z: -2}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &796083562
GameObject:
m_ObjectHideFlags: 0
@@ -3845,7 +3911,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -4049,7 +4115,7 @@ Transform:
- {fileID: 2127478177}
- {fileID: 1634666903}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1981789686
GameObject:
diff --git a/Maquette/Assets/Scripts/LifeVillain.cs b/Maquette/Assets/Scripts/LifeVillain.cs
index c66cccd0cdabd744fc3f72687c8773fca933517b..143a238305ef1e7d40e540e06d0fda05e5787144 100644
--- a/Maquette/Assets/Scripts/LifeVillain.cs
+++ b/Maquette/Assets/Scripts/LifeVillain.cs
@@ -16,6 +16,7 @@ public class LifeVillain : MonoBehaviour
//public GameObject villainHealthBar;
GameObject villainHealthBar;
public Vector3 offset;
+ public GameObject kamikaze;
// Update is called once per frame
void Awake()
@@ -35,7 +36,7 @@ public class LifeVillain : MonoBehaviour
}
void OnTriggerEnter2D (Collider2D Target){
- if(Target.tag == "DamageMaker"){
+ if(Target.tag == "DamageMaker" && Target != kamikaze){
LoseLife(Target.GetComponent<damageMaker>().damage);
}
/*
diff --git a/Maquette/Assets/Scripts/TowerLife.cs b/Maquette/Assets/Scripts/TowerLife.cs
index 75ecbb4b8dd851e67feae507d0f526f985682ff4..27b5b799e43f28fc9a3070da74b0ddf16d5ffa54 100644
--- a/Maquette/Assets/Scripts/TowerLife.cs
+++ b/Maquette/Assets/Scripts/TowerLife.cs
@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -32,7 +32,7 @@ public class TowerLife : MonoBehaviour
}
if (Target.tag == "Explosion"){
- LoseLife(300);
+ LoseLife(200);
}
}
diff --git a/Maquette/Assets/Spawner.cs b/Maquette/Assets/Spawner.cs
new file mode 100644
index 0000000000000000000000000000000000000000..52bb07e0749b13ec453c875f9f3d18e4020493a2
--- /dev/null
+++ b/Maquette/Assets/Spawner.cs
@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Spawner : MonoBehaviour
+{
+ public float duration;
+ public GameObject Kamikaze;
+ bool isCoroutineReady = true;
+
+ // Start is called before the first frame update
+
+ void Update(){
+ if (isCoroutineReady){
+ Instantiate(Kamikaze, this.transform.position, this.transform.rotation);
+ isCoroutineReady = false;
+ StartCoroutine(Cooldown());
+ }
+ }
+
+ IEnumerator Cooldown(){
+ yield return new WaitForSeconds(duration);
+ isCoroutineReady = true;
+ }
+
+
+}
\ No newline at end of file
diff --git a/Maquette/Assets/Spawner.cs.meta b/Maquette/Assets/Spawner.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..487de9c04e42b16c2026fd043fa43b271d827872
--- /dev/null
+++ b/Maquette/Assets/Spawner.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 51ed8449ac4536e439a38df212c0d04e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/SpeedBonus.prefab b/Maquette/Assets/SpeedBonus.prefab
index b06bdb013ad429b0bb24f8b87ff030daadca11f8..70c04b3b51fa375b00aa7300e1e385b09b6acb7c 100644
--- a/Maquette/Assets/SpeedBonus.prefab
+++ b/Maquette/Assets/SpeedBonus.prefab
@@ -107,7 +107,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8, y: 8.11}
+ m_Size: {x: 11, y: 11}
m_EdgeRadius: 0
--- !u!114 &5308852454019452877
MonoBehaviour:
diff --git a/Maquette/Assets/Sprites/Aseprite/Kamikaze.png b/Maquette/Assets/Sprites/Aseprite/Kamikaze.png
index 34b5cddc67ad9ce233f41641604b2447d335a52f..8c8b255e3be5a2ca72818b6d4a91bf0d5c6cd49d 100644
Binary files a/Maquette/Assets/Sprites/Aseprite/Kamikaze.png and b/Maquette/Assets/Sprites/Aseprite/Kamikaze.png differ
diff --git a/Maquette/Assets/WeaponLoot.prefab b/Maquette/Assets/WeaponLoot.prefab
index a1c8cc20a9d22f977e49c6d46d9031a2bbd40a83..fabf4c73cf53febc30b71b02bf88ffafbb673ddc 100644
--- a/Maquette/Assets/WeaponLoot.prefab
+++ b/Maquette/Assets/WeaponLoot.prefab
@@ -179,7 +179,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 163.22192, y: 149.97707}
+ m_Size: {x: 160, y: 160}
m_EdgeRadius: 0
--- !u!114 &3075358178863567136
MonoBehaviour: