diff --git a/Maquette/Assets/Animations/Bobby.controller b/Maquette/Assets/Animations/Bobby.controller
index 689fb9ba1708ab97ddebe48a0b0026f07eea8bd9..0fae12a6ae1ad9a5902b9b9d5c2b7f71efac2895 100644
--- a/Maquette/Assets/Animations/Bobby.controller
+++ b/Maquette/Assets/Animations/Bobby.controller
@@ -7,7 +7,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Player_IsShooting
+ m_Name: Bobby_IsShooting
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@@ -21,7 +21,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: e51545398b70f4f368cd5f79eccace8c, type: 2}
+ m_Motion: {fileID: 7400000, guid: c3ec64c6e03738c4eaae84cf71bbb029, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -34,7 +34,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Player_StartShooting
+ m_Name: Bobby_StartShooting
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@@ -48,7 +48,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 9788840f86e69440697317894ec7ef58, type: 2}
+ m_Motion: {fileID: 7400000, guid: cc55a1da6dc740a4eb8daa16fb7b49f1, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -61,7 +61,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Player_Walk
+ m_Name: Bobby_Walk
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@@ -75,7 +75,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 76cbba9271ffb4ac1a7542978e5784e8, type: 2}
+ m_Motion: {fileID: 7400000, guid: 4e8e6aebd2aec664b8e9be5261f01414, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@@ -106,6 +106,32 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+--- !u!1102 &-5856360133412590802
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Player_Idle 0
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 07d74bfd499584ac290205cadeef427b, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
--- !u!1101 &-2505373158597301100
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -190,6 +216,31 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
+--- !u!1101 &514846338794177343
+AnimatorStateTransition:
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Walking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7221565923696655667}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &1283257369220647741
AnimatorState:
serializedVersion: 5
@@ -197,7 +248,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Player_StopsShooting
+ m_Name: Bobby_StopsShooting
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@@ -211,12 +262,37 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 922c5eeee1eb84d12b58dc63dce02314, type: 2}
+ m_Motion: {fileID: 7400000, guid: 425942b60e3b2ab498a2af39dc08dff3, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!1101 &3479701173989539152
+AnimatorStateTransition:
+ m_ObjectHideFlags: 3
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: Shooting
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -7814159179548483909}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0
+ m_TransitionOffset: 0.00000014853694
+ m_ExitTime: 0.0000000010895695
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1107 &4702399453555667175
AnimatorStateMachine:
serializedVersion: 5
@@ -308,7 +384,7 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Player_Idle
+ m_Name: Bobby_Idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
@@ -323,7 +399,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
- m_Motion: {fileID: 7400000, guid: 07d74bfd499584ac290205cadeef427b, type: 2}
+ m_Motion: {fileID: 7400000, guid: ffff43da401ec8047a1ed032bd6c6a6d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
diff --git a/Maquette/Assets/Animations/Bobby_Idle.anim b/Maquette/Assets/Animations/Bobby_Idle.anim
new file mode 100644
index 0000000000000000000000000000000000000000..c0c06458634b15839273e56d26b05651f1475c33
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_Idle.anim
@@ -0,0 +1,249 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bobby_Idle
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 0
+ attribute: 413499720
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 1872933342
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 4197328169
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 2368279999
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping:
+ - {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.016666668
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Maquette/Assets/LifeUp.prefab.meta b/Maquette/Assets/Animations/Bobby_Idle.anim.meta
similarity index 54%
rename from Maquette/Assets/LifeUp.prefab.meta
rename to Maquette/Assets/Animations/Bobby_Idle.anim.meta
index 4139c6ad0afbc667f40e38a25f02f3f1e3d9b4c4..d972777f4ec0abe2524c020369bb474525c3d9ad 100644
--- a/Maquette/Assets/LifeUp.prefab.meta
+++ b/Maquette/Assets/Animations/Bobby_Idle.anim.meta
@@ -1,7 +1,8 @@
fileFormatVersion: 2
-guid: fc35b6f9278194b03b569c66ac46dcdc
-PrefabImporter:
+guid: ffff43da401ec8047a1ed032bd6c6a6d
+NativeFormatImporter:
externalObjects: {}
+ mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Maquette/Assets/Animations/Bobby_IsShooting.anim b/Maquette/Assets/Animations/Bobby_IsShooting.anim
new file mode 100644
index 0000000000000000000000000000000000000000..818292c6c97ba20900c1350f7f187a679baf89e0
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_IsShooting.anim
@@ -0,0 +1,325 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bobby_IsShooting
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 3123993412194684718, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ - time: 1
+ value: {fileID: 3123993412194684718, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 0
+ attribute: 4197328169
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 2368279999
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 413499720
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 1872933342
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping:
+ - {fileID: 3123993412194684718, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ - {fileID: 3123993412194684718, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1.0166667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Maquette/Assets/Animations/Bobby_IsShooting.anim.meta b/Maquette/Assets/Animations/Bobby_IsShooting.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..b694f7549499def379358fa6168ff7dc20065ecb
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_IsShooting.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c3ec64c6e03738c4eaae84cf71bbb029
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Animations/Bobby_StartShooting.anim b/Maquette/Assets/Animations/Bobby_StartShooting.anim
new file mode 100644
index 0000000000000000000000000000000000000000..6a9fce74202522dfb3ded7b28dfbb0d8eab8f716
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_StartShooting.anim
@@ -0,0 +1,74 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bobby_StartShooting
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 21300000, guid: 769dd468e5a8f7743ae02c2123275da7, type: 3}
+ - time: 0.05
+ value: {fileID: 21300000, guid: 769dd468e5a8f7743ae02c2123275da7, type: 3}
+ - time: 1
+ value: {fileID: 21300000, guid: 769dd468e5a8f7743ae02c2123275da7, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 21300000, guid: 769dd468e5a8f7743ae02c2123275da7, type: 3}
+ - {fileID: 21300000, guid: 769dd468e5a8f7743ae02c2123275da7, type: 3}
+ - {fileID: 21300000, guid: 769dd468e5a8f7743ae02c2123275da7, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1.0166667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Maquette/Assets/Animations/Bobby_StartShooting.anim.meta b/Maquette/Assets/Animations/Bobby_StartShooting.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..68e79ad74f1f6366efad6682df53e3f75558e31e
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_StartShooting.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cc55a1da6dc740a4eb8daa16fb7b49f1
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Animations/Bobby_StopShooting.anim b/Maquette/Assets/Animations/Bobby_StopShooting.anim
new file mode 100644
index 0000000000000000000000000000000000000000..093d2e74af665d58f269af90e0b185d5ef403c82
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_StopShooting.anim
@@ -0,0 +1,73 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bobby_StopShooting
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves: []
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ - time: 1
+ value: {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ - {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 1.0166667
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves: []
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Maquette/Assets/Animations/Bobby_StopShooting.anim.meta b/Maquette/Assets/Animations/Bobby_StopShooting.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..689c208c08644046ea1b3a428bc9a1d1f53346f2
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_StopShooting.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 425942b60e3b2ab498a2af39dc08dff3
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Animations/Bobby_walk.anim b/Maquette/Assets/Animations/Bobby_walk.anim
new file mode 100644
index 0000000000000000000000000000000000000000..90dbc44cd03f4d050c6e49e2661c463a6496d882
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_walk.anim
@@ -0,0 +1,337 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Bobby_walk
+ serializedVersion: 6
+ m_Legacy: 0
+ m_Compressed: 0
+ m_UseHighQualityCurve: 1
+ m_RotationCurves: []
+ m_CompressedRotationCurves: []
+ m_EulerCurves: []
+ m_PositionCurves: []
+ m_ScaleCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: -6668228949919029502, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ - time: 0.16666667
+ value: {fileID: -4508802689790340033, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ - time: 0.33333334
+ value: {fileID: -6668228949919029502, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ - time: 0.5
+ value: {fileID: -4508802689790340033, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ - time: 0.6666667
+ value: {fileID: -6668228949919029502, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 60
+ m_WrapMode: 0
+ m_Bounds:
+ m_Center: {x: 0, y: 0, z: 0}
+ m_Extent: {x: 0, y: 0, z: 0}
+ m_ClipBindingConstant:
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 0
+ attribute: 4197328169
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 2368279999
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 413499720
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 1872933342
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ pptrCurveMapping:
+ - {fileID: -6668228949919029502, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ - {fileID: -4508802689790340033, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ - {fileID: -6668228949919029502, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ - {fileID: -4508802689790340033, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ - {fileID: -6668228949919029502, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ m_AnimationClipSettings:
+ serializedVersion: 2
+ m_AdditiveReferencePoseClip: {fileID: 0}
+ m_AdditiveReferencePoseTime: 0
+ m_StartTime: 0
+ m_StopTime: 0.68333334
+ m_OrientationOffsetY: 0
+ m_Level: 0
+ m_CycleOffset: 0
+ m_HasAdditiveReferencePose: 0
+ m_LoopTime: 0
+ m_LoopBlend: 0
+ m_LoopBlendOrientation: 0
+ m_LoopBlendPositionY: 0
+ m_LoopBlendPositionXZ: 0
+ m_KeepOriginalOrientation: 0
+ m_KeepOriginalPositionY: 1
+ m_KeepOriginalPositionXZ: 0
+ m_HeightFromFeet: 0
+ m_Mirror: 0
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.68333334
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ m_EulerEditorCurves: []
+ m_HasGenericRootTransform: 0
+ m_HasMotionFloatCurves: 0
+ m_Events: []
diff --git a/Maquette/Assets/Animations/Bobby_walk.anim.meta b/Maquette/Assets/Animations/Bobby_walk.anim.meta
new file mode 100644
index 0000000000000000000000000000000000000000..b1cefe30cfbf1b06c9c96a5e3a6c70c6dc74255d
--- /dev/null
+++ b/Maquette/Assets/Animations/Bobby_walk.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4e8e6aebd2aec664b8e9be5261f01414
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Animations/Clyde.controller b/Maquette/Assets/Animations/Clyde.controller
index 36259fb5c989c3ff5945bf5a9fc55cbb6611d0c6..fc572a8dc9278f54901efcd3cc968a58ec274b05 100644
--- a/Maquette/Assets/Animations/Clyde.controller
+++ b/Maquette/Assets/Animations/Clyde.controller
@@ -170,13 +170,13 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
- m_Name: Shooting
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
- m_Controller: {fileID: 0}
+ m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
diff --git a/Maquette/Assets/Animations/Clyde_Idle.anim b/Maquette/Assets/Animations/Clyde_Idle.anim
index 110a063f20693535fac6e2201ac33a08c387951a..d088eb8136631e7eae9428b951f08da8db59293b 100644
--- a/Maquette/Assets/Animations/Clyde_Idle.anim
+++ b/Maquette/Assets/Animations/Clyde_Idle.anim
@@ -16,11 +16,87 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: 5602337906906987636, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
attribute: m_Sprite
path:
@@ -40,8 +116,36 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 0
+ attribute: 413499720
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 1872933342
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 4197328169
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 2368279999
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping:
- - {fileID: 5602337906906987636, guid: 233099d2482f2431a91dc010a9029178, type: 3}
+ - {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
@@ -62,8 +166,91 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0
+ functionName:
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Maquette/Assets/Animations/Fire/Burn.anim b/Maquette/Assets/Animations/Fire/Burn.anim
index 0cf0de68cf996dd2c689f7e01641bb557a9db93e..b84d4c23a2fbabf9c35b612994d2046bb1968807 100644
--- a/Maquette/Assets/Animations/Fire/Burn.anim
+++ b/Maquette/Assets/Animations/Fire/Burn.anim
@@ -20,126 +20,13 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: 1173900870165143218, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.016666668
- value: {fileID: -3992146525530141369, guid: 849865f84c95f419cac0e4f041d9c016,
+ value: {fileID: -369691517897656074, guid: 6b9f4694f53ca084590a1a789aebb46f,
type: 3}
- time: 0.033333335
- value: {fileID: 4718903101049364922, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.05
- value: {fileID: 4329846552807827043, guid: 849865f84c95f419cac0e4f041d9c016,
+ value: {fileID: 1535082918638315374, guid: 6b9f4694f53ca084590a1a789aebb46f,
type: 3}
- time: 0.06666667
- value: {fileID: 2717775787587762615, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.083333336
- value: {fileID: 3062897876276871073, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.1
- value: {fileID: -5778142776877831284, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.11666667
- value: {fileID: 4735563210668852298, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.13333334
- value: {fileID: 1728072031555816825, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.15
- value: {fileID: 1996991056468688670, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.16666667
- value: {fileID: 2909825306961525433, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.18333334
- value: {fileID: -3630495874915686022, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.2
- value: {fileID: 4994212793304100687, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.21666667
- value: {fileID: -752057598271470234, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.23333333
- value: {fileID: -7477869802644954732, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.25
- value: {fileID: -4949017178011330942, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.26666668
- value: {fileID: -8698403084095387529, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.28333333
- value: {fileID: 1966808177910297722, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.3
- value: {fileID: 4219635762725118524, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.31666666
- value: {fileID: 1437954303251078848, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.33333334
- value: {fileID: 4048821887661897986, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.35
- value: {fileID: 3539271008760800618, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.36666667
- value: {fileID: 1528699940344462469, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.38333333
- value: {fileID: 7687687932613260827, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.4
- value: {fileID: 9089980578183756414, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.41666666
- value: {fileID: -6225923603779911169, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.43333334
- value: {fileID: 9137737684103887658, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.45
- value: {fileID: -4944381598987702898, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.46666667
- value: {fileID: -3020298180624477895, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.48333332
- value: {fileID: 4308038881007625564, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.5
- value: {fileID: -8907165407357706602, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.51666665
- value: {fileID: -1019708705193641268, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.53333336
- value: {fileID: 969473394014062065, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.55
- value: {fileID: -918534561444220818, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.56666666
- value: {fileID: -7932068124151033613, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.5833333
- value: {fileID: 11498120895288198, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - time: 0.6
- value: {fileID: -5577469707748518924, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.6166667
- value: {fileID: 8202861767183823309, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.6333333
- value: {fileID: 2783278889061292076, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.65
- value: {fileID: -6595174152095732901, guid: 849865f84c95f419cac0e4f041d9c016,
- type: 3}
- - time: 0.6666667
- value: {fileID: -2835883324916693023, guid: 849865f84c95f419cac0e4f041d9c016,
+ value: {fileID: 7050651123713931954, guid: 6b9f4694f53ca084590a1a789aebb46f,
type: 3}
attribute: m_Sprite
path:
@@ -160,53 +47,15 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- - {fileID: 1173900870165143218, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -3992146525530141369, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 4718903101049364922, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 4329846552807827043, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 2717775787587762615, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 3062897876276871073, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -5778142776877831284, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 4735563210668852298, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 1728072031555816825, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 1996991056468688670, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 2909825306961525433, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -3630495874915686022, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 4994212793304100687, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -752057598271470234, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -7477869802644954732, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -4949017178011330942, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -8698403084095387529, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 1966808177910297722, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 4219635762725118524, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 1437954303251078848, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 4048821887661897986, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 3539271008760800618, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 1528699940344462469, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 7687687932613260827, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 9089980578183756414, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -6225923603779911169, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 9137737684103887658, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -4944381598987702898, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -3020298180624477895, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 4308038881007625564, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -8907165407357706602, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -1019708705193641268, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 969473394014062065, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -918534561444220818, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -7932068124151033613, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 11498120895288198, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -5577469707748518924, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 8202861767183823309, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: 2783278889061292076, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -6595174152095732901, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
- - {fileID: -2835883324916693023, guid: 849865f84c95f419cac0e4f041d9c016, type: 3}
+ - {fileID: -369691517897656074, guid: 6b9f4694f53ca084590a1a789aebb46f, type: 3}
+ - {fileID: 1535082918638315374, guid: 6b9f4694f53ca084590a1a789aebb46f, type: 3}
+ - {fileID: 7050651123713931954, guid: 6b9f4694f53ca084590a1a789aebb46f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.68333334
+ m_StopTime: 0.083333336
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Maquette/Assets/Animations/Player_Idle.anim b/Maquette/Assets/Animations/Player_Idle.anim
index f1ba23b7f59d2a3cdad3af2bac8b06f13f51da99..68568fd0ba6c9669a6c701beab11234b0cdee02f 100644
--- a/Maquette/Assets/Animations/Player_Idle.anim
+++ b/Maquette/Assets/Animations/Player_Idle.anim
@@ -16,11 +16,126 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: 6426868497666326525, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ - time: 1
+ value: {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7,
type: 3}
attribute: m_Sprite
path:
@@ -33,6 +148,20 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 413499720
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 4197328169
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 0
@@ -40,14 +169,29 @@ AnimationClip:
typeID: 212
customType: 23
isPPtrCurve: 1
+ - serializedVersion: 2
+ path: 0
+ attribute: 1872933342
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
+ - serializedVersion: 2
+ path: 0
+ attribute: 2368279999
+ script: {fileID: 0}
+ typeID: 61
+ customType: 0
+ isPPtrCurve: 0
pptrCurveMapping:
- - {fileID: 6426868497666326525, guid: 233099d2482f2431a91dc010a9029178, type: 3}
+ - {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
+ - {fileID: -2495348672860257905, guid: ef53a46b04457874285e9a85c34305b7, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.016666668
+ m_StopTime: 1.0166667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -62,7 +206,119 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.5
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1.0166667
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Maquette/Assets/Animations/Player_IsShooting.anim b/Maquette/Assets/Animations/Player_IsShooting.anim
index 1769297cbe3d51749973b835e4baaf343e024cd8..e8a5ad7e9a36cec7b2923e906812480b6fc7eb06 100644
--- a/Maquette/Assets/Animations/Player_IsShooting.anim
+++ b/Maquette/Assets/Animations/Player_IsShooting.anim
@@ -16,11 +16,87 @@ AnimationClip:
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
- m_FloatCurves: []
+ m_FloatCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: 5044450397378941176, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: 3163984606673106782, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
attribute: m_Sprite
path:
@@ -32,16 +108,8 @@ AnimationClip:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings:
- - serializedVersion: 2
- path: 0
- attribute: 0
- script: {fileID: 0}
- typeID: 212
- customType: 23
- isPPtrCurve: 1
- pptrCurveMapping:
- - {fileID: 5044450397378941176, guid: 233099d2482f2431a91dc010a9029178, type: 3}
+ genericBindings: []
+ pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
@@ -62,7 +130,83 @@ AnimationClip:
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
- m_EditorCurves: []
+ m_EditorCurves:
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: -0.3
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Offset.y
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.x
+ path:
+ classID: 61
+ script: {fileID: 0}
+ - curve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0.7
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 136
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ attribute: m_Size.y
+ path:
+ classID: 61
+ script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Maquette/Assets/Animations/Player_StartShooting.anim b/Maquette/Assets/Animations/Player_StartShooting.anim
index 5131d2a78b319237fed8cc6e8a6cb16340e4c5bb..385aa14a0029ae0cdcd24bb0de59cbd1e961a63f 100644
--- a/Maquette/Assets/Animations/Player_StartShooting.anim
+++ b/Maquette/Assets/Animations/Player_StartShooting.anim
@@ -20,10 +20,12 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: 5602337906906987636, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
- time: 0.083333336
- value: {fileID: -3861952770410913445, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: 21300000, guid: 83354e6d26355d64987cf025b006d369, type: 3}
+ - time: 0.16666667
+ value: {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
attribute: m_Sprite
path:
@@ -44,14 +46,15 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- - {fileID: 5602337906906987636, guid: 233099d2482f2431a91dc010a9029178, type: 3}
- - {fileID: -3861952770410913445, guid: 233099d2482f2431a91dc010a9029178, type: 3}
+ - {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
+ - {fileID: 21300000, guid: 83354e6d26355d64987cf025b006d369, type: 3}
+ - {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.16666667
+ m_StopTime: 0.25
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Maquette/Assets/Animations/Player_StopsShooting.anim b/Maquette/Assets/Animations/Player_StopsShooting.anim
index 8d698dea992854a52366c079b77bda67c43afbee..447f87a5359e5baa98a864c94479fc884620befb 100644
--- a/Maquette/Assets/Animations/Player_StopsShooting.anim
+++ b/Maquette/Assets/Animations/Player_StopsShooting.anim
@@ -20,10 +20,7 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: 1871739406167786269, guid: 233099d2482f2431a91dc010a9029178,
- type: 3}
- - time: 0.083333336
- value: {fileID: 6426868497666326525, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
attribute: m_Sprite
path:
@@ -44,14 +41,13 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- - {fileID: 1871739406167786269, guid: 233099d2482f2431a91dc010a9029178, type: 3}
- - {fileID: 6426868497666326525, guid: 233099d2482f2431a91dc010a9029178, type: 3}
+ - {fileID: -8821246903848866948, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.16666667
+ m_StopTime: 0.083333336
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Maquette/Assets/Animations/Player_Walk.anim b/Maquette/Assets/Animations/Player_Walk.anim
index 9cbdd1e90089efc93252d434cf29ea32b98c5ada..cc089777af22d880e1fdb28bd71f7533b715760e 100644
--- a/Maquette/Assets/Animations/Player_Walk.anim
+++ b/Maquette/Assets/Animations/Player_Walk.anim
@@ -20,16 +20,16 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: 3530494885523508410, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: 798241067041979410, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
- time: 0.083333336
- value: {fileID: 1910719979137897025, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: 3163984606673106782, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
- time: 0.16666667
- value: {fileID: -959359598807138626, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: 7369475662483389385, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
- time: 0.25
- value: {fileID: 6581714141959652647, guid: 233099d2482f2431a91dc010a9029178,
+ value: {fileID: 3163984606673106782, guid: e413be8661b25e04fbfe87715ccc7b05,
type: 3}
attribute: m_Sprite
path:
@@ -50,10 +50,10 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- - {fileID: 3530494885523508410, guid: 233099d2482f2431a91dc010a9029178, type: 3}
- - {fileID: 1910719979137897025, guid: 233099d2482f2431a91dc010a9029178, type: 3}
- - {fileID: -959359598807138626, guid: 233099d2482f2431a91dc010a9029178, type: 3}
- - {fileID: 6581714141959652647, guid: 233099d2482f2431a91dc010a9029178, type: 3}
+ - {fileID: 798241067041979410, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
+ - {fileID: 3163984606673106782, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
+ - {fileID: 7369475662483389385, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
+ - {fileID: 3163984606673106782, guid: e413be8661b25e04fbfe87715ccc7b05, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
diff --git a/Maquette/Assets/Bobby transition.png b/Maquette/Assets/Bobby transition.png
new file mode 100644
index 0000000000000000000000000000000000000000..04798ee75fde64ff3ccaf8d30b235bb584c9c21a
Binary files /dev/null and b/Maquette/Assets/Bobby transition.png differ
diff --git a/Maquette/Assets/Bobby transition.png.meta b/Maquette/Assets/Bobby transition.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..7fb3ea0aeac946a7d8210aee21dbe5d071cdc28c
--- /dev/null
+++ b/Maquette/Assets/Bobby transition.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 769dd468e5a8f7743ae02c2123275da7
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Bobby wins.png b/Maquette/Assets/Bobby wins.png
new file mode 100644
index 0000000000000000000000000000000000000000..730aacd40f4cfd875c5dad0acb9f482ff3af8022
Binary files /dev/null and b/Maquette/Assets/Bobby wins.png differ
diff --git a/Maquette/Assets/Bobby wins.png.meta b/Maquette/Assets/Bobby wins.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..59ee9c4ca88cc02f3594e06c4c26e74ea6b9aecd
--- /dev/null
+++ b/Maquette/Assets/Bobby wins.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 1443d31f0b999e94e8809c983d37b896
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Clyde transition.png b/Maquette/Assets/Clyde transition.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbbc4b1f934a0e0b85e7ed15022e95dbb1d75110
Binary files /dev/null and b/Maquette/Assets/Clyde transition.png differ
diff --git a/Maquette/Assets/Clyde transition.png.meta b/Maquette/Assets/Clyde transition.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f543c8e0c339c77f24516040dd79fa0b6491a0b0
--- /dev/null
+++ b/Maquette/Assets/Clyde transition.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 83354e6d26355d64987cf025b006d369
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Clyde wins.png b/Maquette/Assets/Clyde wins.png
new file mode 100644
index 0000000000000000000000000000000000000000..583864dfb8be548e83164d2359cb8120185745d5
Binary files /dev/null and b/Maquette/Assets/Clyde wins.png differ
diff --git a/Maquette/Assets/Clyde wins.png.meta b/Maquette/Assets/Clyde wins.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..3e3fee6862237dc15d4c4d802ad6375ab16b3bcf
--- /dev/null
+++ b/Maquette/Assets/Clyde wins.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f99c0cb9fb5557d40826890d343c818a
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/DmgBonus.cs b/Maquette/Assets/DmgBonus.cs
index 48283f67a75db076e5948e5f1b40dc9a99c7a651..73129b643d69a75c87b7a5e185cc30ead3d750a8 100644
--- a/Maquette/Assets/DmgBonus.cs
+++ b/Maquette/Assets/DmgBonus.cs
@@ -33,7 +33,7 @@ public class DmgBonus : MonoBehaviour
if(Input.GetButtonDown("ChangeWeaponBobby")){
if(Target.GetComponent<CashBobby>().cash >= value){
if(Clyde != null){
- Clyde.GetComponent<CashClyde>().ChangeCash(-value);
+ Target.GetComponent<CashBobby>().ChangeCash(-value);
Clyde.GetComponent<LifeClyde>().Downgrade(malus);
}
@@ -45,7 +45,7 @@ public class DmgBonus : MonoBehaviour
if(Input.GetButtonDown("ChangeWeaponClyde")){
if(Target.GetComponent<CashClyde>().cash >= value){
if(Bobby != null){
- Bobby.GetComponent<CashBobby>().ChangeCash(-value);
+ Target.GetComponent<CashClyde>().ChangeCash(-value);
Bobby.GetComponent<LifeBobby>().Downgrade(malus);
}
Destroy(gameObject);
diff --git a/Maquette/Assets/Flame thrower.png b/Maquette/Assets/Flame thrower.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dc879e9c2b6a403dfc6f64eb6855f9c6e6836e3
Binary files /dev/null and b/Maquette/Assets/Flame thrower.png differ
diff --git a/Maquette/Assets/Flame thrower.png.meta b/Maquette/Assets/Flame thrower.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..3104f0056095ddcdc79f84ab7192470d676b1cf0
--- /dev/null
+++ b/Maquette/Assets/Flame thrower.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: c5545e81932177c4eaa66ec270b230c0
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Flames.png b/Maquette/Assets/Flames.png
new file mode 100644
index 0000000000000000000000000000000000000000..150801c32ec5b68ffbbe0679306d902d693117fd
Binary files /dev/null and b/Maquette/Assets/Flames.png differ
diff --git a/Maquette/Assets/Flames.png.meta b/Maquette/Assets/Flames.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ef2806b25bacc95d0fbfbb2b3f7671b2b143ed67
--- /dev/null
+++ b/Maquette/Assets/Flames.png.meta
@@ -0,0 +1,176 @@
+fileFormatVersion: 2
+guid: 6b9f4694f53ca084590a1a789aebb46f
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: -369691517897656074
+ second: Flames_0
+ - first:
+ 213: 1535082918638315374
+ second: Flames_1
+ - first:
+ 213: 7050651123713931954
+ second: Flames_2
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 2
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: Flames_0
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 90
+ height: 180
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 6f83c3fe5879edaf0800000000000000
+ internalID: -369691517897656074
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Flames_1
+ rect:
+ serializedVersion: 2
+ x: 110
+ y: 0
+ width: 90
+ height: 180
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: e67e43208c5bd4510800000000000000
+ internalID: 1535082918638315374
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Flames_2
+ rect:
+ serializedVersion: 2
+ x: 220
+ y: 0
+ width: 90
+ height: 180
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 2ba7d2057d1f8d160800000000000000
+ internalID: 7050651123713931954
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Grenade launcher.png b/Maquette/Assets/Grenade launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..7766ece8fc2aeb48d6bea61a455652d0441472a2
Binary files /dev/null and b/Maquette/Assets/Grenade launcher.png differ
diff --git a/Maquette/Assets/Grenade launcher.png.meta b/Maquette/Assets/Grenade launcher.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..bf72c79ac598cb8ce87f7f01ff40a8ff0ca08a3a
--- /dev/null
+++ b/Maquette/Assets/Grenade launcher.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: c373358d4f1e8af48b8e1ac16fd4576b
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Grenade.png b/Maquette/Assets/Grenade.png
new file mode 100644
index 0000000000000000000000000000000000000000..c713e606d599328e027380f13536d0bb6421b527
Binary files /dev/null and b/Maquette/Assets/Grenade.png differ
diff --git a/Maquette/Assets/Grenade.png.meta b/Maquette/Assets/Grenade.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ce96ae2ca5f638cb8baf155601b376055232792e
--- /dev/null
+++ b/Maquette/Assets/Grenade.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f25a07768ae205a40bb93b04cdb79ccf
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Intro.png b/Maquette/Assets/Intro.png
new file mode 100644
index 0000000000000000000000000000000000000000..57ef330516218f44a38f602d282dbdf9bad19f60
Binary files /dev/null and b/Maquette/Assets/Intro.png differ
diff --git a/Maquette/Assets/Intro.png.meta b/Maquette/Assets/Intro.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..273f6e32ae6a55e579297fb30b6a4e4c5526bc9a
--- /dev/null
+++ b/Maquette/Assets/Intro.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: ecf3e4019b3d90c4a840e48d69b0c819
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/InvSpawner.cs b/Maquette/Assets/InvSpawner.cs
new file mode 100644
index 0000000000000000000000000000000000000000..c1335841c2b7a05713d380853051601666a40b5a
--- /dev/null
+++ b/Maquette/Assets/InvSpawner.cs
@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class InvSpawner : MonoBehaviour
+{
+ public float duration;
+ public GameObject Kamikaze;
+ bool isCoroutineReady = true;
+ Vector2 v1 = new Vector2(7,4);
+ Vector2 v2 = new Vector2(7,-4);
+ Vector2 v3 = new Vector2(-7,4);
+ Vector2 v4 = new Vector2(-7,-4);
+ System.Random ran = new System.Random();
+
+ // Start is called before the first frame update
+
+ void Update(){
+
+ if (isCoroutineReady){
+ int x = ran.Next(4);
+ if (x == 0)
+ Instantiate(Kamikaze, v1, this.transform.rotation);
+ if (x == 1)
+ Instantiate(Kamikaze, v2, this.transform.rotation);
+ if (x == 2)
+ Instantiate(Kamikaze, v3, this.transform.rotation);
+ if (x == 3)
+ Instantiate(Kamikaze, v4, this.transform.rotation);
+ isCoroutineReady = false;
+ StartCoroutine(Cooldown());
+ }
+ }
+
+ IEnumerator Cooldown(){
+ yield return new WaitForSeconds(duration);
+ isCoroutineReady = true;
+ }
+}
diff --git a/Maquette/Assets/InvSpawner.cs.meta b/Maquette/Assets/InvSpawner.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fda8efd6e600e1d285f0d9bbea0ef374c3a736fd
--- /dev/null
+++ b/Maquette/Assets/InvSpawner.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7de7b60712cf1fa44a8ba8db0e6e325e
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/LifeUp.prefab b/Maquette/Assets/LifeUp.prefab
deleted file mode 100644
index b62a8e0273ecd1bd399294cc3e3fa107993af3c2..0000000000000000000000000000000000000000
--- a/Maquette/Assets/LifeUp.prefab
+++ /dev/null
@@ -1,123 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1564419176581148229
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 3456671081044510420}
- - component: {fileID: 720193521723616461}
- - component: {fileID: 6650693972555435797}
- - component: {fileID: 3246853047336580223}
- m_Layer: 0
- m_Name: LifeUp
- m_TagString: LifeUp
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &3456671081044510420
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1564419176581148229}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.25830275, y: 0.53514874, z: 0}
- m_LocalScale: {x: 0.1, y: 0.1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &720193521723616461
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1564419176581148229}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9f44cd34649a24ab9a6d5cd8297ce821, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!212 &6650693972555435797
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1564419176581148229}
- 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: -427479191
- m_SortingLayer: 4
- m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9b062f3e398014758aa234aa04a141f1, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 8, y: 8.11}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
---- !u!61 &3246853047336580223
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1564419176581148229}
- 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: 8, y: 8.11}
- newSize: {x: 8, y: 8.11}
- adaptiveTilingThreshold: 0.5
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 10, y: 10}
- m_EdgeRadius: 0
diff --git a/Maquette/Assets/Rocket.png b/Maquette/Assets/Rocket.png
new file mode 100644
index 0000000000000000000000000000000000000000..7970672829f3b615e5623754172864e88466246e
Binary files /dev/null and b/Maquette/Assets/Rocket.png differ
diff --git a/Maquette/Assets/Rocket.png.meta b/Maquette/Assets/Rocket.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..41fde32efd544488477bd6a8770b6459f6205547
--- /dev/null
+++ b/Maquette/Assets/Rocket.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 09f9eaabe3ae53f43a5c66515380e726
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Scenes/Salle0.unity b/Maquette/Assets/Scenes/Salle0.unity
index 8e048c5c35e2e6e73a73caeec30961b2386ff34e..631652e98b2e0c282dbd524e0a5ba81d604825d4 100644
--- a/Maquette/Assets/Scenes/Salle0.unity
+++ b/Maquette/Assets/Scenes/Salle0.unity
@@ -121,7 +121,7 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &322189006
+--- !u!1 &155726298
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -129,43 +129,80 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 322189008}
- - component: {fileID: 322189007}
+ - component: {fileID: 155726300}
+ - component: {fileID: 155726299}
m_Layer: 0
- m_Name: ReturnToStart
+ m_Name: BeautifulPicture
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!114 &322189007
-MonoBehaviour:
+--- !u!212 &155726299
+SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 322189006}
+ m_GameObject: {fileID: 155726298}
m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: dd2602917ecfb40c69251bb614eff6cd, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- target: 1
---- !u!4 &322189008
+ 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: 63f59587c05f46047bb610987f2141cf, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 25.002125, y: 11.5}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &155726300
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 322189006}
+ m_GameObject: {fileID: 155726298}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.41295207, y: -0.5419851, z: -5.2034664}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 342.96036}
+ m_LocalScale: {x: 1.3, y: 1.3, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 0
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &589540956
+--- !u!1 &322189006
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -173,97 +210,42 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 589540960}
- - component: {fileID: 589540959}
- - component: {fileID: 589540958}
- - component: {fileID: 589540957}
- m_Layer: 5
- m_Name: Canvas
+ - component: {fileID: 322189008}
+ - component: {fileID: 322189007}
+ m_Layer: 0
+ m_Name: ReturnToStart
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!114 &589540957
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 589540956}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_IgnoreReversedGraphics: 1
- m_BlockingObjects: 0
- m_BlockingMask:
- serializedVersion: 2
- m_Bits: 4294967295
---- !u!114 &589540958
+--- !u!114 &322189007
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 589540956}
+ m_GameObject: {fileID: 322189006}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Script: {fileID: 11500000, guid: dd2602917ecfb40c69251bb614eff6cd, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_UiScaleMode: 0
- m_ReferencePixelsPerUnit: 100
- m_ScaleFactor: 1
- m_ReferenceResolution: {x: 800, y: 600}
- m_ScreenMatchMode: 0
- m_MatchWidthOrHeight: 0
- m_PhysicalUnit: 3
- m_FallbackScreenDPI: 96
- m_DefaultSpriteDPI: 96
- m_DynamicPixelsPerUnit: 1
---- !u!223 &589540959
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 589540956}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 1
- m_Camera: {fileID: 1280391371}
- m_PlaneDistance: 100
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 0
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_AdditionalShaderChannelsFlag: 0
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
---- !u!224 &589540960
-RectTransform:
+ target: 1
+--- !u!4 &322189008
+Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 589540956}
+ m_GameObject: {fileID: 322189006}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0, y: 0, z: 0}
- m_Children:
- - {fileID: 1787780662}
+ m_LocalPosition: {x: -0.41295207, y: -0.5419851, z: -5.2034664}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
+ m_RootOrder: 0
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!1 &979096976
GameObject:
m_ObjectHideFlags: 0
@@ -328,7 +310,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1280391368
GameObject:
@@ -431,79 +413,5 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1787780661
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1787780662}
- - component: {fileID: 1787780664}
- - component: {fileID: 1787780663}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1787780662
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1787780661}
- 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: 589540960}
- m_RootOrder: 0
+ m_RootOrder: 1
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: -8, y: 24.6}
- m_SizeDelta: {x: 534.82855, y: 346.02142}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1787780663
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1787780661}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0.15686275, g: 0.15686275, b: 0.15686275, a: 1}
- m_RaycastTarget: 1
- m_Maskable: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 0}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &1787780664
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1787780661}
- m_CullTransparentMesh: 0
diff --git a/Maquette/Assets/Scenes/Salle1.unity b/Maquette/Assets/Scenes/Salle1.unity
index 4772ad64a9f63fff79d64113a0627b13a0ccc7f1..6e5f177263389c1c8d345ce96cab148d5f8c24b8 100644
--- a/Maquette/Assets/Scenes/Salle1.unity
+++ b/Maquette/Assets/Scenes/Salle1.unity
@@ -152,9 +152,9 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 76975892}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -2.18, y: 2.16, z: 93.341064}
- m_LocalScale: {x: 0.7, y: 0.7, z: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 3, z: 93.341064}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1528629699}
- {fileID: 177982805}
@@ -214,18 +214,18 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
+ m_Offset: {x: -0.3, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 0.9, y: 1.28}
+ oldSize: {x: 1.5, y: 0.8}
newSize: {x: 3, y: 2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 0.6, y: 1}
+ m_Size: {x: 0.7, y: 0.7}
m_EdgeRadius: 0
--- !u!114 &76975897
MonoBehaviour:
@@ -240,6 +240,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
speedbonus: 1
+ angle: -90
weapons: {fileID: 11400000, guid: 1919b5b27e7b84012a3f4bba54b04b0f, type: 2}
Speedtext: {fileID: 187543950}
--- !u!114 &76975898
@@ -319,8 +320,9 @@ SpriteRenderer:
m_SortingLayerID: 507560563
m_SortingLayer: 5
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: d4a5ad1de83aa4a02aabc59469545d6e, type: 3}
- m_Color: {r: 0.5898679, g: 0.5182004, b: 0.8018868, a: 1}
+ m_Sprite: {fileID: -6668228949919029502, guid: ef53a46b04457874285e9a85c34305b7,
+ type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -349,6 +351,135 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!1001 &87372962
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1359145541}
+ m_Modifications:
+ - target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: gunName
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: value
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567138, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_Name
+ value: WeaponLoot (4)
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -185
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 80
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 40
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
--- !u!1 &89850631
GameObject:
m_ObjectHideFlags: 0
@@ -519,7 +650,7 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: -108
+ value: -90
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -529,12 +660,12 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_SizeDelta.x
- value: 100
+ value: 80
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_SizeDelta.y
- value: 100
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -653,15 +784,15 @@ RectTransform:
m_GameObject: {fileID: 137413149}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.8000256, y: 0.7250232, z: 1.000032}
+ m_LocalScale: {x: 1, y: 1, z: 1.000032}
m_Children: []
m_Father: {fileID: 1372233035}
m_RootOrder: 3
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: -316.99997, y: -126}
- m_SizeDelta: {x: 63.335968, y: 67.395966}
+ m_AnchoredPosition: {x: -340, y: -126}
+ m_SizeDelta: {x: 63, y: 31.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &177982804
GameObject:
@@ -799,7 +930,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: 338.99994, y: 44}
+ m_AnchoredPosition: {x: 365, y: 40}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &187543950
@@ -898,8 +1029,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 225478090}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.27, y: 0.19, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: 8.6, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
m_Father: {fileID: 292083826}
m_RootOrder: 3
@@ -964,7 +1095,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: 338.99994, y: -6.000004}
+ m_AnchoredPosition: {x: 365, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &254635126
@@ -1032,15 +1163,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 292083825}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.5482497, y: -0.46845418, z: -2.0453706}
+ m_LocalPosition: {x: 0, y: 0, z: -2.0453706}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 615365395}
- {fileID: 1983900418}
- {fileID: 370445321}
- {fileID: 225478091}
- - {fileID: 1981471060}
- - {fileID: 604216914}
m_Father: {fileID: 728440725}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1108,7 +1237,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &370445320
GameObject:
@@ -1135,8 +1264,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 370445320}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -7.73, y: 0.30230787, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: -7, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
m_Father: {fileID: 292083826}
m_RootOrder: 2
@@ -1267,7 +1396,7 @@ 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: 278.99994, y: 54}
+ m_AnchoredPosition: {x: 300, y: 54}
m_SizeDelta: {x: 210, y: 55}
m_Pivot: {x: 0.49999997, y: 0.49999994}
--- !u!1 &407788999
@@ -1437,7 +1566,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -1477,69 +1606,81 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 458278265}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.86, y: -0.28, z: -2.9173949}
+ m_LocalPosition: {x: 0.9, y: -0.1, z: -2.9173949}
m_LocalScale: {x: 1.4285713, y: 1.4285713, z: 1}
m_Children: []
m_Father: {fileID: 661256184}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &604216913
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 604216914}
- - component: {fileID: 604216915}
- m_Layer: 9
- m_Name: Mur (5)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &604216914
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 604216913}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36, y: 3.9, z: -0.2957139}
- m_LocalScale: {x: 0.39999998, y: 2, z: 1.02}
- m_Children: []
- m_Father: {fileID: 292083826}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &604216915
-BoxCollider2D:
+--- !u!1001 &559754456
+PrefabInstance:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 604216913}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -3
+ 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: 0
+ 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: 6
+ 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 (3)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
--- !u!1 &615365394
GameObject:
m_ObjectHideFlags: 0
@@ -1565,7 +1706,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 615365394}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.59, y: -4.6, z: 0}
+ m_LocalPosition: {x: 0.59, y: -5.1, z: 0}
m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 292083826}
@@ -1631,7 +1772,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: 339, y: 19}
+ m_AnchoredPosition: {x: 365, y: 20}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &617007955
@@ -1706,9 +1847,9 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 661256183}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0.73, y: 2.15, z: 93.341064}
- m_LocalScale: {x: 0.7, y: 0.7, z: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: -3, z: 93.341064}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 458278266}
- {fileID: 1282406966}
@@ -1787,6 +1928,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
speedbonus: 1
direction: {x: 0, y: 0}
+ angle: 90
Speedtext: {fileID: 2004159441}
--- !u!114 &661256189
MonoBehaviour:
@@ -1821,14 +1963,14 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 0.9, y: 1.28}
+ oldSize: {x: 1.5, y: 0.8}
newSize: {x: 0.9, y: 1.28}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 0.6, y: 1}
+ m_Size: {x: 0.5, y: 0.7}
m_EdgeRadius: 0
--- !u!212 &661256191
SpriteRenderer:
@@ -1869,8 +2011,9 @@ SpriteRenderer:
m_SortingLayerID: 507560563
m_SortingLayer: 5
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: d4a5ad1de83aa4a02aabc59469545d6e, type: 3}
- m_Color: {r: 0.735849, g: 0.2256141, b: 0.2256141, a: 1}
+ m_Sprite: {fileID: 3163984606673106782, guid: e413be8661b25e04fbfe87715ccc7b05,
+ type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
@@ -2007,7 +2150,7 @@ Transform:
- {fileID: 1624791555}
- {fileID: 292083826}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &734422010
GameObject:
@@ -2083,6 +2226,12 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 734422010}
m_CullTransparentMesh: 0
+--- !u!224 &828789551 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ m_PrefabInstance: {fileID: 1845324091}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &876669268
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2179,7 +2328,7 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 109
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -2189,12 +2338,12 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_SizeDelta.x
- value: 100
+ value: 80
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_SizeDelta.y
- value: 100
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -2334,7 +2483,7 @@ 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: -276.99997, y: 54.000004}
+ m_AnchoredPosition: {x: -300, y: 54.000004}
m_SizeDelta: {x: 210, y: 55}
m_Pivot: {x: 0.5, y: 0.49999997}
--- !u!1 &1035733753
@@ -2371,7 +2520,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: -337, y: 19}
+ m_AnchoredPosition: {x: -365, y: 20}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1035733755
@@ -2425,12 +2574,12 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -3.5
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -2440,17 +2589,17 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -2460,7 +2609,7 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 8
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -2482,11 +2631,44 @@ PrefabInstance:
propertyPath: next
value: 2
objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670713, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: closedsprite
+ value:
+ objectReference: {fileID: 570604127520474917, guid: 20087621c7d88b740a4eedc76cf6e9b1,
+ type: 3}
+ - target: {fileID: 9060317251694670713, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: opensprite
+ value:
+ objectReference: {fileID: 7560749161186844325, guid: 20087621c7d88b740a4eedc76cf6e9b1,
+ type: 3}
- target: {fileID: 9060317251694670717, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_Name
value: Portal
objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670718, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 570604127520474917, guid: 20087621c7d88b740a4eedc76cf6e9b1,
+ type: 3}
+ - target: {fileID: 9060317251694670718, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_WasSpriteAssigned
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670718, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_Size.x
+ value: 1.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670718, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_Size.y
+ value: 3.9
+ objectReference: {fileID: 0}
- target: {fileID: 9060317251694670719, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_Size.x
@@ -2497,8 +2679,97 @@ PrefabInstance:
propertyPath: m_Size.y
value: 1.7
objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670719, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_SpriteTilingProperty.oldSize.x
+ value: 3.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670719, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_SpriteTilingProperty.oldSize.y
+ value: 1.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670719, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_SpriteTilingProperty.newSize.x
+ value: 1.9
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670719, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_SpriteTilingProperty.newSize.y
+ value: 3.9
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 36bef5cca7d1b4105b94230ca472edff, type: 3}
+--- !u!1001 &1054825204
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 3.3649695
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -2.901362
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425174, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5902828749815425179, guid: f6d75766048fc427b976d42e8919bf84,
+ type: 3}
+ propertyPath: m_Name
+ value: Cash
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: f6d75766048fc427b976d42e8919bf84, type: 3}
--- !u!1 &1107132247
GameObject:
m_ObjectHideFlags: 0
@@ -2538,14 +2809,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1107132247}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.83650607, y: 0.020994449, z: -93.341064}
+ m_LocalPosition: {x: 0, y: 0, z: -93.341064}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1372233035}
- {fileID: 76975893}
- {fileID: 661256184}
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1117914251
GameObject:
@@ -2581,7 +2852,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: -336.99997, y: -5.999996}
+ m_AnchoredPosition: {x: -365, y: 0}
m_SizeDelta: {x: 100, y: 115.3739}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1117914253
@@ -2625,6 +2896,87 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117914251}
m_CullTransparentMesh: 0
+--- !u!1 &1185415058
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1185415060}
+ - component: {fileID: 1185415059}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!212 &1185415059
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1185415058}
+ 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: 1
+ m_Sprite: {fileID: 21300000, guid: f08eb549d6dd74549bbb6fad3fdcf915, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 15.7, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &1185415060
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1185415058}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 308.4154}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1282406965
GameObject:
m_ObjectHideFlags: 0
@@ -6085,8 +6437,10 @@ RectTransform:
- {fileID: 876669269}
- {fileID: 99931545}
- {fileID: 2093286427}
+ - {fileID: 828789551}
+ - {fileID: 1858779060}
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -6108,12 +6462,12 @@ PrefabInstance:
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -2.5
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_LocalPosition.z
- value: -1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
@@ -6138,7 +6492,7 @@ PrefabInstance:
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
@@ -6160,6 +6514,11 @@ PrefabInstance:
propertyPath: m_Name
value: Carpet (2)
objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129962, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_Layer
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
--- !u!1 &1371749972
@@ -6439,15 +6798,15 @@ RectTransform:
m_GameObject: {fileID: 1526830063}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.32375562, y: 0.32375562, z: 0.518009}
+ m_LocalScale: {x: 1, y: 1, z: 0.518009}
m_Children: []
m_Father: {fileID: 1372233035}
m_RootOrder: 2
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: 318.99994, y: -126}
- m_SizeDelta: {x: 163.02585, y: 177.67072}
+ m_AnchoredPosition: {x: 340, y: -126}
+ m_SizeDelta: {x: 63, y: 31.5}
m_Pivot: {x: 0.50000006, y: 0.5}
--- !u!1 &1528629698
GameObject:
@@ -6473,7 +6832,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1528629698}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.61, y: -0.26, z: 0}
+ m_LocalPosition: {x: 0.9, y: -0.1, z: 0}
m_LocalScale: {x: 1.4285713, y: 1.4285713, z: 1}
m_Children: []
m_Father: {fileID: 76975893}
@@ -6722,6 +7081,141 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1627093095}
m_CullTransparentMesh: 0
+--- !u!1001 &1845324091
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1359145541}
+ m_Modifications:
+ - target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: gunName
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: value
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567138, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_Name
+ value: WeaponLoot (3)
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 185
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 80
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 40
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
+--- !u!224 &1858779060 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
+ type: 3}
+ m_PrefabInstance: {fileID: 87372962}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1888066316
GameObject:
m_ObjectHideFlags: 0
@@ -6752,6 +7246,75 @@ Transform:
m_Father: {fileID: 76975893}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1905448842
+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: -6
+ 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: 0
+ 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: 7
+ 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 (4)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
--- !u!1001 &1947714836
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6782,7 +7345,7 @@ PrefabInstance:
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_RootOrder
- value: 3
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
@@ -6799,6 +7362,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6
+ objectReference: {fileID: 0}
- target: {fileID: 1998599832797129962, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_Name
@@ -6811,63 +7379,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
---- !u!1 &1981471059
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1981471060}
- - component: {fileID: 1981471061}
- m_Layer: 9
- m_Name: Mur(4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1981471060
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1981471059}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.9382496, y: 4.0284543, z: -0.14785695}
- m_LocalScale: {x: 0.4, y: 2, z: 1.02}
- m_Children: []
- m_Father: {fileID: 292083826}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1981471061
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1981471059}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
--- !u!1 &1983900417
GameObject:
m_ObjectHideFlags: 0
@@ -6893,7 +7404,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1983900417}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.53, y: 4.53, z: 0}
+ m_LocalPosition: {x: 0.53, y: 4.9, z: 0}
m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 292083826}
@@ -6959,7 +7470,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: -336.99997, y: 44.000004}
+ m_AnchoredPosition: {x: -365, y: 40}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2004159441
@@ -7013,7 +7524,7 @@ PrefabInstance:
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_LocalPosition.x
- value: -3.4
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
@@ -7023,7 +7534,7 @@ PrefabInstance:
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_LocalPosition.z
- value: -1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
@@ -7048,7 +7559,7 @@ PrefabInstance:
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 4
objectReference: {fileID: 0}
- target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
@@ -7147,7 +7658,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: -346.99997, y: 104}
+ m_AnchoredPosition: {x: -365, y: 100}
m_SizeDelta: {x: 56.2, y: 47.6}
m_Pivot: {x: 0.49999997, y: 0.5}
--- !u!1 &2091200589
@@ -7225,7 +7736,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: 348.99994, y: 104}
+ m_AnchoredPosition: {x: 365, y: 100}
m_SizeDelta: {x: 57.562756, y: 47.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!224 &2093286427 stripped
@@ -7244,7 +7755,7 @@ PrefabInstance:
- target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: gunName
- value: 6
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567136, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
@@ -7314,22 +7825,22 @@ PrefabInstance:
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -81
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_SizeDelta.x
- value: 100
+ value: 80
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
propertyPath: m_SizeDelta.y
- value: 100
+ value: 40
objectReference: {fileID: 0}
- target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
type: 3}
diff --git a/Maquette/Assets/Scenes/Salle2.unity b/Maquette/Assets/Scenes/Salle2.unity
index 4b40fb271bd3ddf1d56c018a11affbd8faff3585..7c4bab048ba6c722aaacaca45a35ce7864eca5e0 100644
--- a/Maquette/Assets/Scenes/Salle2.unity
+++ b/Maquette/Assets/Scenes/Salle2.unity
@@ -121,7 +121,7 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &200018452
+--- !u!1 &59338001
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -129,36 +129,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 200018453}
- - component: {fileID: 200018454}
+ - component: {fileID: 59338002}
+ - component: {fileID: 59338003}
m_Layer: 9
- m_Name: Mur(4)
+ m_Name: Mur
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &200018453
+--- !u!4 &59338002
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 200018452}
+ m_GameObject: {fileID: 59338001}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.9382496, y: 4.0284543, z: -0.14785695}
- m_LocalScale: {x: 0.4, y: 2, z: 1.02}
+ m_LocalPosition: {x: 0.59, y: -5.1, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1634666903}
- m_RootOrder: 4
+ m_Father: {fileID: 1182170882}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &200018454
+--- !u!61 &59338003
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 200018452}
+ m_GameObject: {fileID: 59338001}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -178,6 +178,85 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 8.5, y: 1}
m_EdgeRadius: 0
+--- !u!1001 &138448910
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072316778642, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: angle
+ value: -90
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072541147996, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_Name
+ value: Tower
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072541147999, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_Mass
+ value: 0.7238235
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 6bfbb633b1d394a5e9664d690406a9c4, type: 3}
--- !u!1 &237822504
GameObject:
m_ObjectHideFlags: 0
@@ -242,7 +321,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &530759358
GameObject:
@@ -298,7 +377,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -326,7 +405,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &530759362
MonoBehaviour:
@@ -345,65 +424,8 @@ MonoBehaviour:
Clyde: {fileID: 0}
roomCanvas: {fileID: 0}
playersCanvas: {fileID: 0}
- setspawn1: {x: 3, y: 2, z: 0}
- setspawn2: {x: -3, y: -2, z: 0}
---- !u!1 &627848955
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 627848956}
- - component: {fileID: 627848957}
- m_Layer: 9
- m_Name: Mur
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &627848956
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 627848955}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.59, y: -4.6, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1634666903}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &627848957
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 627848955}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
+ setspawn1: {x: -1, y: 3, z: 0}
+ setspawn2: {x: 0, y: -3, z: 0}
--- !u!1 &677784203
GameObject:
m_ObjectHideFlags: 0
@@ -3568,7 +3590,7 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!1 &689577660
+--- !u!1 &771519992
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3576,8 +3598,8 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 689577661}
- - component: {fileID: 689577662}
+ - component: {fileID: 771519993}
+ - component: {fileID: 771519994}
m_Layer: 9
m_Name: Mur (2)
m_TagString: Untagged
@@ -3585,27 +3607,27 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &689577661
+--- !u!4 &771519993
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 689577660}
+ m_GameObject: {fileID: 771519992}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -7.73, y: 0.30230787, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: -7, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 1634666903}
+ m_Father: {fileID: 1182170882}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &689577662
+--- !u!61 &771519994
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 689577660}
+ m_GameObject: {fileID: 771519992}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -3625,7 +3647,7 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
---- !u!1 &796083562
+--- !u!1 &1066680343
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3633,36 +3655,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 796083563}
- - component: {fileID: 796083564}
+ - component: {fileID: 1066680344}
+ - component: {fileID: 1066680345}
m_Layer: 9
- m_Name: Mur (5)
+ m_Name: Mur (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &796083563
+--- !u!4 &1066680344
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 796083562}
+ m_GameObject: {fileID: 1066680343}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36, y: 3.9, z: -0.2957139}
- m_LocalScale: {x: 0.39999998, y: 2, z: 1.02}
+ m_LocalPosition: {x: 0.53, y: 4.9, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1634666903}
- m_RootOrder: 5
+ m_Father: {fileID: 1182170882}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &796083564
+--- !u!61 &1066680345
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 796083562}
+ m_GameObject: {fileID: 1066680343}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -3773,71 +3795,265 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ 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 &1462025128
+--- !u!1 &1182170881
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1182170882}
+ m_Layer: 0
+ m_Name: Murs
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1182170882
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1182170881}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -2.0453706}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 59338002}
+ - {fileID: 1066680344}
+ - {fileID: 771519993}
+ - {fileID: 1740835705}
+ m_Father: {fileID: 1951673975}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1446400011
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1446400013}
+ - component: {fileID: 1446400012}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!212 &1446400012
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1446400011}
+ 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: 1
+ m_Sprite: {fileID: 21300000, guid: f08eb549d6dd74549bbb6fad3fdcf915, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 15.7, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &1446400013
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1446400011}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 308.4154}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1721856662
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_LocalPosition.x
- value: -4.1055603
+ value: -6
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_LocalPosition.y
- value: -1.1993872
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
type: 3}
propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264503, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_SortingLayerID
+ value: -427479191
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264503, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264507, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_Name
+ value: Spawner
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a9f8e59abb23816419164491b6e8677e, type: 3}
+--- !u!1001 &1738558041
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
@@ -3850,47 +4066,11 @@ PrefabInstance:
- target: {fileID: 9060317251694670717, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_Name
- value: Tank
+ value: Portal
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 36bef5cca7d1b4105b94230ca472edff, type: 3}
---- !u!1 &1634666902
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1634666903}
- m_Layer: 0
- m_Name: Murs
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1634666903
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1634666902}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.5482497, y: -0.46845418, z: -2.0453706}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 627848956}
- - {fileID: 1981789687}
- - {fileID: 689577661}
- - {fileID: 1765376532}
- - {fileID: 200018453}
- - {fileID: 796083563}
- m_Father: {fileID: 1951673975}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1765376531
+--- !u!1 &1740835704
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3898,8 +4078,8 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1765376532}
- - component: {fileID: 1765376533}
+ - component: {fileID: 1740835705}
+ - component: {fileID: 1740835706}
m_Layer: 9
m_Name: Mur (3)
m_TagString: Untagged
@@ -3907,27 +4087,27 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1765376532
+--- !u!4 &1740835705
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1765376531}
+ m_GameObject: {fileID: 1740835704}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.27, y: 0.19, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: 8.6, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 1634666903}
+ m_Father: {fileID: 1182170882}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1765376533
+--- !u!61 &1740835706
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1765376531}
+ m_GameObject: {fileID: 1740835704}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -3975,67 +4155,89 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2127478177}
- - {fileID: 1634666903}
+ - {fileID: 1182170882}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1981789686
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1981789687}
- - component: {fileID: 1981789688}
- m_Layer: 9
- m_Name: Mur (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1981789687
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1981789686}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.53, y: 4.53, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1634666903}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1981789688
-BoxCollider2D:
+--- !u!1001 &1995942863
+PrefabInstance:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1981789686}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -3
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072316778642, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: angle
+ value: 90
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072541147996, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_Name
+ value: Tower (1)
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072541147999, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_Mass
+ value: 0.7238235
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 6bfbb633b1d394a5e9664d690406a9c4, type: 3}
--- !u!1 &2127478176
GameObject:
m_ObjectHideFlags: 0
diff --git a/Maquette/Assets/Scenes/Salle3.unity b/Maquette/Assets/Scenes/Salle3.unity
index 4b1eac35d6479f56c8ef744c4d1198dce44af071..309c9e64a18a168a149aee94803a51170d462aca 100644
--- a/Maquette/Assets/Scenes/Salle3.unity
+++ b/Maquette/Assets/Scenes/Salle3.unity
@@ -121,63 +121,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &26433373
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 26433374}
- - component: {fileID: 26433375}
- m_Layer: 9
- m_Name: Mur(4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &26433374
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 26433373}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.9382496, y: 4.0284543, z: -0.14785695}
- m_LocalScale: {x: 0.4, y: 2, z: 1.02}
- m_Children: []
- m_Father: {fileID: 1619014870}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &26433375
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 26433373}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
--- !u!1 &39242541
GameObject:
m_ObjectHideFlags: 0
@@ -269,13 +212,70 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 8
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!1 &68716515
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 68716516}
+ - component: {fileID: 68716517}
+ m_Layer: 9
+ m_Name: Mur
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &68716516
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 68716515}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.59, y: -5.1, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1799160274}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &68716517
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 68716515}
+ 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}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 8.5, y: 1}
+ m_EdgeRadius: 0
--- !u!1 &192711291
GameObject:
m_ObjectHideFlags: 0
@@ -340,65 +340,8 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &565733533
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 565733534}
- - component: {fileID: 565733535}
- m_Layer: 9
- m_Name: Mur (5)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &565733534
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565733533}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36, y: 3.9, z: -0.2957139}
- m_LocalScale: {x: 0.39999998, y: 2, z: 1.02}
- m_Children: []
- m_Father: {fileID: 1619014870}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &565733535
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 565733533}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
--- !u!1 &671472231
GameObject:
m_ObjectHideFlags: 0
@@ -3607,43 +3550,76 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
---- !u!1 &1619014869
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1619014870}
- m_Layer: 0
- m_Name: Murs
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1619014870
-Transform:
+--- !u!1001 &864543637
+PrefabInstance:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1619014869}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.5482497, y: -0.46845418, z: -2.0453706}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1808787414}
- - {fileID: 1688956519}
- - {fileID: 1976445031}
- - {fileID: 1756414555}
- - {fileID: 26433374}
- - {fileID: 565733534}
- m_Father: {fileID: 1830190112}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1688956518
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100374, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_Name
+ value: Villain (2)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4a9ea4d464fe04784ba00d102d98db70, type: 3}
+--- !u!1 &1015375309
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3651,8 +3627,8 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1688956519}
- - component: {fileID: 1688956520}
+ - component: {fileID: 1015375310}
+ - component: {fileID: 1015375311}
m_Layer: 9
m_Name: Mur (1)
m_TagString: Untagged
@@ -3660,27 +3636,27 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1688956519
+--- !u!4 &1015375310
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1688956518}
+ m_GameObject: {fileID: 1015375309}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.53, y: 4.53, z: 0}
+ m_LocalPosition: {x: 0.53, y: 4.9, z: 0}
m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1619014870}
+ m_Father: {fileID: 1799160274}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1688956520
+--- !u!61 &1015375311
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1688956518}
+ m_GameObject: {fileID: 1015375309}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -3700,64 +3676,157 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 8.5, y: 1}
m_EdgeRadius: 0
---- !u!1 &1756414554
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1756414555}
- - component: {fileID: 1756414556}
- m_Layer: 9
- m_Name: Mur (3)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1756414555
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1756414554}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.27, y: 0.19, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
- m_Children: []
- m_Father: {fileID: 1619014870}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1756414556
-BoxCollider2D:
+--- !u!1001 &1341136106
+PrefabInstance:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1756414554}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 1, y: 8}
- m_EdgeRadius: 0
---- !u!1 &1808787413
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -6.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -4
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264507, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_Name
+ value: Spawner
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a9f8e59abb23816419164491b6e8677e, type: 3}
+--- !u!1 &1510583422
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1510583424}
+ - component: {fileID: 1510583423}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!212 &1510583423
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1510583422}
+ 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: 1
+ m_Sprite: {fileID: 21300000, guid: f08eb549d6dd74549bbb6fad3fdcf915, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 15.7, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &1510583424
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1510583422}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 308.4154}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 10
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1651236799
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3765,36 +3834,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1808787414}
- - component: {fileID: 1808787415}
+ - component: {fileID: 1651236800}
+ - component: {fileID: 1651236801}
m_Layer: 9
- m_Name: Mur
+ m_Name: Mur (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1808787414
+--- !u!4 &1651236800
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1808787413}
+ m_GameObject: {fileID: 1651236799}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.59, y: -4.6, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
+ m_LocalPosition: {x: -7, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 1619014870}
- m_RootOrder: 0
+ m_Father: {fileID: 1799160274}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1808787415
+--- !u!61 &1651236801
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1808787413}
+ m_GameObject: {fileID: 1651236799}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -3812,9 +3881,9 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
+ m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
---- !u!1 &1830190111
+--- !u!1 &1666471936
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3822,68 +3891,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1830190112}
- m_Layer: 0
- m_Name: Frame
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1830190112
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1830190111}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.780414, y: 0.016146315, z: -0.14785685}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 730821320}
- - {fileID: 1619014870}
- m_Father: {fileID: 0}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1976445030
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1976445031}
- - component: {fileID: 1976445032}
+ - component: {fileID: 1666471937}
+ - component: {fileID: 1666471938}
m_Layer: 9
- m_Name: Mur (2)
+ m_Name: Mur (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1976445031
+--- !u!4 &1666471937
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1976445030}
+ m_GameObject: {fileID: 1666471936}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -7.73, y: 0.30230787, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: 8.6, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 1619014870}
- m_RootOrder: 2
+ m_Father: {fileID: 1799160274}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1976445032
+--- !u!61 &1666471938
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1976445030}
+ m_GameObject: {fileID: 1666471936}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -3903,6 +3940,210 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
+--- !u!1001 &1776247701
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100374, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_Name
+ value: Villain (3)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4a9ea4d464fe04784ba00d102d98db70, type: 3}
+--- !u!1001 &1779730015
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.35
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100374, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_Name
+ value: Villain (1)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4a9ea4d464fe04784ba00d102d98db70, type: 3}
+--- !u!1 &1799160273
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1799160274}
+ m_Layer: 0
+ m_Name: Murs
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1799160274
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1799160273}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -2.0453706}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 68716516}
+ - {fileID: 1015375310}
+ - {fileID: 1651236800}
+ - {fileID: 1666471937}
+ m_Father: {fileID: 1830190112}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1830190111
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1830190112}
+ m_Layer: 0
+ m_Name: Frame
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1830190112
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1830190111}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.780414, y: 0.016146315, z: -0.14785685}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 730821320}
+ - {fileID: 1799160274}
+ m_Father: {fileID: 0}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1978308248
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3913,7 +4154,7 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.x
- value: -0
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -4013,8 +4254,8 @@ MonoBehaviour:
Clyde: {fileID: 0}
roomCanvas: {fileID: 0}
playersCanvas: {fileID: 0}
- setspawn1: {x: 0, y: 0, z: 0}
- setspawn2: {x: 0, y: 0, z: 0}
+ setspawn1: {x: -1, y: 3, z: 0}
+ setspawn2: {x: 1, y: -2.5, z: 0}
--- !u!81 &2093873428
AudioListener:
m_ObjectHideFlags: 0
@@ -4050,7 +4291,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -4078,5 +4319,74 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &2109262355
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100374, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_Name
+ value: Villain
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4a9ea4d464fe04784ba00d102d98db70, type: 3}
diff --git a/Maquette/Assets/Scenes/Salle4.unity b/Maquette/Assets/Scenes/Salle4.unity
index 00c3e0735c1c9bae1dd2c47c6033b10d153e422c..15ecad2053c73485da894e3062940121b2b19c94 100644
--- a/Maquette/Assets/Scenes/Salle4.unity
+++ b/Maquette/Assets/Scenes/Salle4.unity
@@ -121,7 +121,145 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &38278069
+--- !u!1001 &80958085
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -6.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264496, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7612275727987264507, guid: a9f8e59abb23816419164491b6e8677e,
+ type: 3}
+ propertyPath: m_Name
+ value: Spawner
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a9f8e59abb23816419164491b6e8677e, type: 3}
+--- !u!1001 &309205523
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072138560575, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4254414072541147996, guid: 6bfbb633b1d394a5e9664d690406a9c4,
+ type: 3}
+ propertyPath: m_Name
+ value: Tower
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 6bfbb633b1d394a5e9664d690406a9c4, type: 3}
+--- !u!1 &310219698
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -129,8 +267,8 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 38278070}
- - component: {fileID: 38278071}
+ - component: {fileID: 310219699}
+ - component: {fileID: 310219700}
m_Layer: 9
m_Name: Mur
m_TagString: Untagged
@@ -138,27 +276,27 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &38278070
+--- !u!4 &310219699
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 38278069}
+ m_GameObject: {fileID: 310219698}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.59, y: -4.6, z: 0}
+ m_LocalPosition: {x: 0.59, y: -5.1, z: 0}
m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 846736153}
+ m_Father: {fileID: 484805550}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &38278071
+--- !u!61 &310219700
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 38278069}
+ m_GameObject: {fileID: 310219698}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -178,7 +316,7 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 8.5, y: 1}
m_EdgeRadius: 0
---- !u!1 &441303000
+--- !u!1 &484805549
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -186,55 +324,32 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 441303001}
- - component: {fileID: 441303002}
- m_Layer: 9
- m_Name: Mur (2)
+ - component: {fileID: 484805550}
+ m_Layer: 0
+ m_Name: Murs
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &441303001
+--- !u!4 &484805550
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 441303000}
+ m_GameObject: {fileID: 484805549}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -7.73, y: 0.30230787, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
- m_Children: []
- m_Father: {fileID: 846736153}
- m_RootOrder: 2
+ m_LocalPosition: {x: 0, y: 0, z: -2.0453706}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 310219699}
+ - {fileID: 1252344671}
+ - {fileID: 1806244906}
+ - {fileID: 1543924902}
+ m_Father: {fileID: 982586656}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &441303002
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 441303000}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 1, y: 8}
- m_EdgeRadius: 0
--- !u!1001 &509701415
PrefabInstance:
m_ObjectHideFlags: 0
@@ -245,12 +360,12 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.x
- value: -0.28
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.43
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -280,7 +395,7 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -309,162 +424,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 36bef5cca7d1b4105b94230ca472edff, type: 3}
---- !u!1001 &582674745
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 727226450}
- m_Modifications:
- - target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
- propertyPath: m_SizeDelta.x
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
- propertyPath: m_SizeDelta.y
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -0.00000023842
- objectReference: {fileID: 0}
- - target: {fileID: 1443105013, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567138, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_Name
- value: WeaponLoot
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: -4089.222
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_RootOrder
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: -125.7
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -13.7
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_SizeDelta.x
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_SizeDelta.y
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_AnchorMin.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_AnchorMin.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_AnchorMax.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_AnchorMax.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_Pivot.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_Pivot.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalScale.x
- value: 22.7179
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalScale.y
- value: 22.7179
- objectReference: {fileID: 0}
- - target: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- propertyPath: m_LocalScale.z
- value: 45.4358
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 78693896f7745454ab93ce8ac583a135, type: 3}
---- !u!224 &582674746 stripped
-RectTransform:
- m_CorrespondingSourceObject: {fileID: 3075358178863567139, guid: 78693896f7745454ab93ce8ac583a135,
- type: 3}
- m_PrefabInstance: {fileID: 582674745}
- m_PrefabAsset: {fileID: 0}
--- !u!1 &727226446
GameObject:
m_ObjectHideFlags: 0
@@ -554,10 +513,9 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
- m_Children:
- - {fileID: 582674746}
+ m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -630,156 +588,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &846736152
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 846736153}
- m_Layer: 0
- m_Name: Murs
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &846736153
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 846736152}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.5482497, y: -0.46845418, z: -2.0453706}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 38278070}
- - {fileID: 2047081952}
- - {fileID: 441303001}
- - {fileID: 1980608619}
- - {fileID: 847030212}
- - {fileID: 973981166}
- m_Father: {fileID: 982586656}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &847030211
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 847030212}
- - component: {fileID: 847030213}
- m_Layer: 9
- m_Name: Mur(4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &847030212
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 847030211}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.9382496, y: 4.0284543, z: -0.14785695}
- m_LocalScale: {x: 0.4, y: 2, z: 1.02}
- m_Children: []
- m_Father: {fileID: 846736153}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &847030213
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 847030211}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
---- !u!1 &973981165
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 973981166}
- - component: {fileID: 973981167}
- m_Layer: 9
- m_Name: Mur (5)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &973981166
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 973981165}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36, y: 3.9, z: -0.2957139}
- m_LocalScale: {x: 0.39999998, y: 2, z: 1.02}
- m_Children: []
- m_Father: {fileID: 846736153}
- m_RootOrder: 5
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &973981167
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 973981165}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
--- !u!1 &982586655
GameObject:
m_ObjectHideFlags: 0
@@ -808,9 +616,9 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1103515334}
- - {fileID: 846736153}
+ - {fileID: 484805550}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &984397097
GameObject:
@@ -848,8 +656,8 @@ MonoBehaviour:
Clyde: {fileID: 0}
roomCanvas: {fileID: 0}
playersCanvas: {fileID: 0}
- setspawn1: {x: 0, y: 0, z: 0}
- setspawn2: {x: 0, y: 0, z: 0}
+ setspawn1: {x: -1, y: 3, z: 0}
+ setspawn2: {x: -3, y: 1, z: 0}
--- !u!81 &984397099
AudioListener:
m_ObjectHideFlags: 0
@@ -885,7 +693,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -907,15 +715,185 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 984397097}
+ m_GameObject: {fileID: 984397097}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -10}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1103515333
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1103515334}
+ - component: {fileID: 1103515335}
+ m_Layer: 0
+ m_Name: Grid
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1103515334
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1103515333}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.780414, y: -0.016146315, z: 0.14785685}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1669140239}
+ m_Father: {fileID: 982586656}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!156049354 &1103515335
+Grid:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1103515333}
+ m_Enabled: 1
+ m_CellSize: {x: 1, y: 1, z: 0}
+ m_CellGap: {x: 0, y: 0, z: 0}
+ m_CellLayout: 0
+ m_CellSwizzle: 0
+--- !u!1 &1252344670
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1252344671}
+ - component: {fileID: 1252344672}
+ m_Layer: 9
+ m_Name: Mur (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1252344671
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1252344670}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -10}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalPosition: {x: 0.53, y: 4.9, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_Father: {fileID: 484805550}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1103515333
+--- !u!61 &1252344672
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1252344670}
+ 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}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 8.5, y: 1}
+ m_EdgeRadius: 0
+--- !u!1001 &1441541477
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100374, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_Name
+ value: Villain
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4a9ea4d464fe04784ba00d102d98db70, type: 3}
+--- !u!1 &1543924901
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -923,42 +901,55 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1103515334}
- - component: {fileID: 1103515335}
- m_Layer: 0
- m_Name: Grid
+ - component: {fileID: 1543924902}
+ - component: {fileID: 1543924903}
+ m_Layer: 9
+ m_Name: Mur (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1103515334
+--- !u!4 &1543924902
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1103515333}
+ m_GameObject: {fileID: 1543924901}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.780414, y: -0.016146315, z: 0.14785685}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1669140239}
- m_Father: {fileID: 982586656}
- m_RootOrder: 0
+ m_LocalPosition: {x: 8.6, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
+ m_Children: []
+ m_Father: {fileID: 484805550}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!156049354 &1103515335
-Grid:
+--- !u!61 &1543924903
+BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1103515333}
+ m_GameObject: {fileID: 1543924901}
m_Enabled: 1
- m_CellSize: {x: 1, y: 1, z: 0}
- m_CellGap: {x: 0, y: 0, z: 0}
- m_CellLayout: 0
- m_CellSwizzle: 0
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ 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, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 1, y: 8}
+ m_EdgeRadius: 0
--- !u!1 &1669140238
GameObject:
m_ObjectHideFlags: 0
@@ -4123,7 +4114,7 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!1 &1980608618
+--- !u!1 &1806244905
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -4131,36 +4122,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1980608619}
- - component: {fileID: 1980608620}
+ - component: {fileID: 1806244906}
+ - component: {fileID: 1806244907}
m_Layer: 9
- m_Name: Mur (3)
+ m_Name: Mur (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1980608619
+--- !u!4 &1806244906
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1980608618}
+ m_GameObject: {fileID: 1806244905}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.27, y: 0.19, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: -7, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 846736153}
- m_RootOrder: 3
+ m_Father: {fileID: 484805550}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1980608620
+--- !u!61 &1806244907
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1980608618}
+ m_GameObject: {fileID: 1806244905}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -4180,7 +4171,76 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
---- !u!1 &2047081951
+--- !u!1001 &1838430663
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -2
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: -2.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100369, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1999743495383100374, guid: 4a9ea4d464fe04784ba00d102d98db70,
+ type: 3}
+ propertyPath: m_Name
+ value: Villain (1)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 4a9ea4d464fe04784ba00d102d98db70, type: 3}
+--- !u!1 &2135958876
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -4188,52 +4248,76 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2047081952}
- - component: {fileID: 2047081953}
- m_Layer: 9
- m_Name: Mur (1)
+ - component: {fileID: 2135958878}
+ - component: {fileID: 2135958877}
+ m_Layer: 0
+ m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &2047081952
-Transform:
+--- !u!212 &2135958877
+SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2047081951}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.53, y: 4.53, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 846736153}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &2047081953
-BoxCollider2D:
+ m_GameObject: {fileID: 2135958876}
+ 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: 1
+ m_Sprite: {fileID: 21300000, guid: f08eb549d6dd74549bbb6fad3fdcf915, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 15.7, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &2135958878
+Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2047081951}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
+ m_GameObject: {fileID: 2135958876}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 308.4154}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 9
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Maquette/Assets/Scenes/Salle5.unity b/Maquette/Assets/Scenes/Salle5.unity
index 12cec28be24d26b55e9b3ca0e378951223b4a8f9..4fb0f349c786521149289b5bd5739b0b3b5e26cf 100644
--- a/Maquette/Assets/Scenes/Salle5.unity
+++ b/Maquette/Assets/Scenes/Salle5.unity
@@ -121,7 +121,7 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &36073364
+--- !u!1 &74252954
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -129,36 +129,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 36073365}
- - component: {fileID: 36073366}
+ - component: {fileID: 74252955}
+ - component: {fileID: 74252956}
m_Layer: 9
- m_Name: Mur (3)
+ m_Name: Mur
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &36073365
+--- !u!4 &74252955
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 36073364}
+ m_GameObject: {fileID: 74252954}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.27, y: 0.19, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: 0.59, y: -5.1, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 817347367}
- m_RootOrder: 3
+ m_Father: {fileID: 1887639870}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &36073366
+--- !u!61 &74252956
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 36073364}
+ m_GameObject: {fileID: 74252954}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -176,9 +176,164 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 1, y: 8}
+ m_Size: {x: 8.5, y: 1}
m_EdgeRadius: 0
---- !u!1 &397188643
+--- !u!1 &143752359
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 143752361}
+ - component: {fileID: 143752360}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!212 &143752360
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 143752359}
+ 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: 1
+ m_Sprite: {fileID: 21300000, guid: f08eb549d6dd74549bbb6fad3fdcf915, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 15.7, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &143752361
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 143752359}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 308.4154}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &287434401
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086346, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086357, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: angle
+ value: -90
+ objectReference: {fileID: 0}
+ - target: {fileID: 4671451443811086358, guid: b1031e3a7c10644e9a3b8ff5d18458b5,
+ type: 3}
+ propertyPath: m_Name
+ value: Tank
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: b1031e3a7c10644e9a3b8ff5d18458b5, type: 3}
+--- !u!1 &625202101
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -186,36 +341,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 397188644}
- - component: {fileID: 397188645}
+ - component: {fileID: 625202102}
+ - component: {fileID: 625202103}
m_Layer: 9
- m_Name: Mur (5)
+ m_Name: Mur (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &397188644
+--- !u!4 &625202102
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 397188643}
+ m_GameObject: {fileID: 625202101}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36, y: 3.9, z: -0.2957139}
- m_LocalScale: {x: 0.39999998, y: 2, z: 1.02}
+ m_LocalPosition: {x: -7, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 817347367}
- m_RootOrder: 5
+ m_Father: {fileID: 1887639870}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &397188645
+--- !u!61 &625202103
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 397188643}
+ m_GameObject: {fileID: 625202101}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -233,44 +388,8 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
+ m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
---- !u!1 &817347366
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 817347367}
- m_Layer: 0
- m_Name: Murs
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &817347367
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 817347366}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.5482497, y: -0.46845418, z: -2.0453706}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1566617273}
- - {fileID: 1250029669}
- - {fileID: 1334182169}
- - {fileID: 36073365}
- - {fileID: 2031401507}
- - {fileID: 397188644}
- m_Father: {fileID: 919579801}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &919579800
GameObject:
m_ObjectHideFlags: 0
@@ -299,9 +418,9 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1051960782}
- - {fileID: 817347367}
+ - {fileID: 1887639870}
m_Father: {fileID: 0}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &983208583
PrefabInstance:
@@ -313,12 +432,12 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.x
- value: -0.28
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.43
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -348,7 +467,7 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -421,6 +540,63 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
+--- !u!1 &1097538236
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1097538237}
+ - component: {fileID: 1097538238}
+ m_Layer: 9
+ m_Name: Mur (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1097538237
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097538236}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.53, y: 4.9, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1887639870}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &1097538238
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1097538236}
+ 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}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 8.5, y: 1}
+ m_EdgeRadius: 0
--- !u!1 &1173295260
GameObject:
m_ObjectHideFlags: 0
@@ -3585,177 +3761,6 @@ Tilemap:
e31: 0
e32: 0
e33: 1
---- !u!1 &1250029668
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1250029669}
- - component: {fileID: 1250029670}
- m_Layer: 9
- m_Name: Mur (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1250029669
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1250029668}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.53, y: 4.53, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 817347367}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1250029670
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1250029668}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
---- !u!1 &1334182168
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1334182169}
- - component: {fileID: 1334182170}
- m_Layer: 9
- m_Name: Mur (2)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1334182169
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1334182168}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -7.73, y: 0.30230787, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
- m_Children: []
- m_Father: {fileID: 817347367}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1334182170
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1334182168}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 1, y: 8}
- m_EdgeRadius: 0
---- !u!1 &1566617272
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1566617273}
- - component: {fileID: 1566617274}
- m_Layer: 9
- m_Name: Mur
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1566617273
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1566617272}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.59, y: -4.6, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 817347367}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1566617274
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1566617272}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
--- !u!1 &1639310314
GameObject:
m_ObjectHideFlags: 0
@@ -3792,8 +3797,8 @@ MonoBehaviour:
Clyde: {fileID: 0}
roomCanvas: {fileID: 0}
playersCanvas: {fileID: 0}
- setspawn1: {x: 0, y: 0, z: 0}
- setspawn2: {x: 0, y: 0, z: 0}
+ setspawn1: {x: 2, y: -2, z: 0}
+ setspawn2: {x: -2, y: -2, z: 0}
--- !u!81 &1639310316
AudioListener:
m_ObjectHideFlags: 0
@@ -3829,7 +3834,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -3857,7 +3862,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1704398276
GameObject:
@@ -3950,13 +3955,104 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 4
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!1 &1820953210
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1820953211}
+ - component: {fileID: 1820953212}
+ m_Layer: 9
+ m_Name: Mur (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1820953211
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1820953210}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 8.6, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1887639870}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &1820953212
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1820953210}
+ 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}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 1, y: 8}
+ m_EdgeRadius: 0
+--- !u!1 &1887639869
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1887639870}
+ m_Layer: 0
+ m_Name: Murs
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1887639870
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1887639869}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -2.0453706}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 74252955}
+ - {fileID: 1097538237}
+ - {fileID: 625202102}
+ - {fileID: 1820953211}
+ m_Father: {fileID: 919579801}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1934712802
GameObject:
m_ObjectHideFlags: 0
@@ -4023,60 +4119,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2031401506
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2031401507}
- - component: {fileID: 2031401508}
- m_Layer: 9
- m_Name: Mur(4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2031401507
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2031401506}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.9382496, y: 4.0284543, z: -0.14785695}
- m_LocalScale: {x: 0.4, y: 2, z: 1.02}
- m_Children: []
- m_Father: {fileID: 817347367}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &2031401508
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2031401506}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
diff --git a/Maquette/Assets/Scenes/Salle6.unity b/Maquette/Assets/Scenes/Salle6.unity
index a4f2c95b3703c666163dedbd3c5cad1dbdcabed4..26ddaecec65c2ec1d88a141cd74c6e7548310410 100644
--- a/Maquette/Assets/Scenes/Salle6.unity
+++ b/Maquette/Assets/Scenes/Salle6.unity
@@ -121,6 +121,85 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
+--- !u!1001 &153710114
+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
+ 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: 0
+ 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 (1)
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129963, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_SortingLayerID
+ value: 977193351
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129963, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_SortingLayer
+ value: 2
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
--- !u!1 &166574151
GameObject:
m_ObjectHideFlags: 0
@@ -157,8 +236,8 @@ MonoBehaviour:
Clyde: {fileID: 0}
roomCanvas: {fileID: 0}
playersCanvas: {fileID: 0}
- setspawn1: {x: 0, y: 0, z: 0}
- setspawn2: {x: 0, y: 0, z: 0}
+ setspawn1: {x: 0, y: 3, z: 0}
+ setspawn2: {x: 0, y: -3, z: 0}
--- !u!81 &166574153
AudioListener:
m_ObjectHideFlags: 0
@@ -194,7 +273,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -222,9 +301,221 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &189618705
+--- !u!1001 &256696700
+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: 6
+ 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: 0
+ 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 (3)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
+--- !u!1001 &266185972
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 5758036818848323920, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
+ type: 3}
+ propertyPath: value
+ value: 5
+ objectReference: {fileID: 0}
+ - 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: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5758036818848323933, guid: c4889e42f2487ad4c92ee933c6c1ccc7,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ 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: 12
+ 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}
+--- !u!1001 &767187338
+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: -6
+ 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: 0
+ 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 (2)
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 3981b243536f7f44c9fe91b4441d85a1, type: 3}
+--- !u!1 &883416437
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -232,151 +523,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 189618706}
- - component: {fileID: 189618707}
- m_Layer: 9
- m_Name: Mur (1)
+ - component: {fileID: 883416438}
+ - component: {fileID: 883416440}
+ - component: {fileID: 883416439}
+ m_Layer: 0
+ m_Name: Tilemap
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &189618706
+--- !u!4 &883416438
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 189618705}
+ m_GameObject: {fileID: 883416437}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.53, y: 4.53, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1255383340}
- m_RootOrder: 1
+ m_Father: {fileID: 931988654}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &189618707
-BoxCollider2D:
+--- !u!483693784 &883416439
+TilemapRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 189618705}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
---- !u!1 &295530850
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 295530851}
- - component: {fileID: 295530852}
- m_Layer: 9
- m_Name: Mur (3)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &295530851
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 295530850}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.27, y: 0.19, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
- m_Children: []
- m_Father: {fileID: 1255383340}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &295530852
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 295530850}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 1, y: 8}
- m_EdgeRadius: 0
---- !u!1 &883416437
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 883416438}
- - component: {fileID: 883416440}
- - component: {fileID: 883416439}
- m_Layer: 0
- m_Name: Tilemap
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &883416438
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 883416437}
- 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: 931988654}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!483693784 &883416439
-TilemapRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 883416437}
+ m_GameObject: {fileID: 883416437}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -3502,6 +3679,63 @@ Tilemap:
e31: 0
e32: 0
e33: 1
+--- !u!1 &917294198
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 917294199}
+ - component: {fileID: 917294200}
+ m_Layer: 9
+ m_Name: Mur (1)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &917294199
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 917294198}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.53, y: 4.9, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1145717117}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &917294200
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 917294198}
+ 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}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 8.5, y: 1}
+ m_EdgeRadius: 0
--- !u!1 &931988653
GameObject:
m_ObjectHideFlags: 0
@@ -3532,7 +3766,7 @@ Transform:
m_Children:
- {fileID: 883416438}
m_Father: {fileID: 1000350935}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!156049354 &931988655
Grid:
@@ -3573,11 +3807,102 @@ Transform:
m_LocalPosition: {x: -0.780414, y: 0.016146315, z: -0.14785685}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1145717117}
- {fileID: 931988654}
- - {fileID: 1255383340}
m_Father: {fileID: 0}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1120005210
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1120005211}
+ - component: {fileID: 1120005212}
+ m_Layer: 9
+ m_Name: Mur (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1120005211
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1120005210}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -7, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1145717117}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &1120005212
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1120005210}
+ 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}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 1, y: 8}
+ m_EdgeRadius: 0
+--- !u!1 &1145717116
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1145717117}
+ m_Layer: 0
+ m_Name: Murs
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1145717117
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1145717116}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -2.0453706}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1964242151}
+ - {fileID: 917294199}
+ - {fileID: 1120005211}
+ - {fileID: 1614635553}
+ m_Father: {fileID: 1000350935}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1182724614
GameObject:
m_ObjectHideFlags: 0
@@ -3669,7 +3994,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -3742,7 +4067,81 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1255383339
+--- !u!1001 &1255592638
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1027322918830954500, guid: f099597eb10e0f34ea13b3c1938855ff,
+ type: 3}
+ propertyPath: value
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1027322918830954502, guid: f099597eb10e0f34ea13b3c1938855ff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ 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: 11
+ 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: 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 &1614635552
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3750,72 +4149,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1255383340}
- m_Layer: 0
- m_Name: Murs
+ - component: {fileID: 1614635553}
+ - component: {fileID: 1614635554}
+ m_Layer: 9
+ m_Name: Mur (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1255383340
+--- !u!4 &1614635553
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1255383339}
+ m_GameObject: {fileID: 1614635552}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.5482497, y: -0.46845418, z: -2.0453706}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1399802566}
- - {fileID: 189618706}
- - {fileID: 1267384090}
- - {fileID: 295530851}
- - {fileID: 1505604744}
- - {fileID: 1626253877}
- m_Father: {fileID: 1000350935}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1267384089
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1267384090}
- - component: {fileID: 1267384091}
- m_Layer: 9
- m_Name: Mur (2)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1267384090
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1267384089}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -7.73, y: 0.30230787, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: 8.6, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 1255383340}
- m_RootOrder: 2
+ m_Father: {fileID: 1145717117}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1267384091
+--- !u!61 &1614635554
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1267384089}
+ m_GameObject: {fileID: 1614635552}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -3835,7 +4198,7 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
---- !u!1 &1399802565
+--- !u!1 &1716039333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3843,113 +4206,154 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1399802566}
- - component: {fileID: 1399802567}
- m_Layer: 9
- m_Name: Mur
+ - component: {fileID: 1716039335}
+ - component: {fileID: 1716039334}
+ m_Layer: 0
+ m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1399802566
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1399802565}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.59, y: -4.6, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1255383340}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1399802567
-BoxCollider2D:
+--- !u!212 &1716039334
+SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1399802565}
+ m_GameObject: {fileID: 1716039333}
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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
---- !u!1 &1505604743
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1505604744}
- - component: {fileID: 1505604745}
- m_Layer: 9
- m_Name: Mur(4)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1505604744
+ 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: 1
+ m_Sprite: {fileID: 21300000, guid: f08eb549d6dd74549bbb6fad3fdcf915, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 15.7, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &1716039335
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1505604743}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.9382496, y: 4.0284543, z: -0.14785695}
- m_LocalScale: {x: 0.4, y: 2, z: 1.02}
+ m_GameObject: {fileID: 1716039333}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 308.4154}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1255383340}
- m_RootOrder: 4
+ m_Father: {fileID: 0}
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1505604745
-BoxCollider2D:
+--- !u!1001 &1905770681
+PrefabInstance:
m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1505604743}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
---- !u!1 &1626253876
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 0.7071068
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: -90
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670713, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: next
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 9060317251694670717, guid: 36bef5cca7d1b4105b94230ca472edff,
+ type: 3}
+ propertyPath: m_Name
+ value: Portal
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 36bef5cca7d1b4105b94230ca472edff, type: 3}
+--- !u!1 &1964242150
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3957,36 +4361,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 1626253877}
- - component: {fileID: 1626253878}
+ - component: {fileID: 1964242151}
+ - component: {fileID: 1964242152}
m_Layer: 9
- m_Name: Mur (5)
+ m_Name: Mur
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &1626253877
+--- !u!4 &1964242151
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1626253876}
+ m_GameObject: {fileID: 1964242150}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36, y: 3.9, z: -0.2957139}
- m_LocalScale: {x: 0.39999998, y: 2, z: 1.02}
+ m_LocalPosition: {x: 0.59, y: -5.1, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1255383340}
- m_RootOrder: 5
+ m_Father: {fileID: 1145717117}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1626253878
+--- !u!61 &1964242152
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1626253876}
+ m_GameObject: {fileID: 1964242150}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -4006,77 +4410,220 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 8.5, y: 1}
m_EdgeRadius: 0
---- !u!1001 &1905770681
+--- !u!1001 &2010793695
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_LocalPosition.x
- value: -0.28
+ value: 3
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.43
+ value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - 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: 4
+ objectReference: {fileID: 0}
+ - target: {fileID: 1998599832797129960, guid: 3981b243536f7f44c9fe91b4441d85a1,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - 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!1001 &2070612261
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -6
+ objectReference: {fileID: 0}
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -6.389725
+ objectReference: {fileID: 0}
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 13
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452464, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670713, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452876, guid: e8a3d36a6b52fc440b85f332119cdd4a,
type: 3}
- propertyPath: next
- value: 7
+ propertyPath: m_Name
+ value: SpeedBonus
objectReference: {fileID: 0}
- - target: {fileID: 9060317251694670717, guid: 36bef5cca7d1b4105b94230ca472edff,
+ - target: {fileID: 5308852454019452877, guid: e8a3d36a6b52fc440b85f332119cdd4a,
+ type: 3}
+ propertyPath: value
+ value: 5
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: e8a3d36a6b52fc440b85f332119cdd4a, type: 3}
+--- !u!1001 &6042058006818076443
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 6042058006873062821, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: value
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062822, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
type: 3}
propertyPath: m_Name
- value: Portal
+ value: LifeBonus
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6042058006873062874, guid: 9c8eb1f9ad9d67847819a296fc304c0f,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 36bef5cca7d1b4105b94230ca472edff, type: 3}
+ m_SourcePrefab: {fileID: 100100000, guid: 9c8eb1f9ad9d67847819a296fc304c0f, type: 3}
diff --git a/Maquette/Assets/Scenes/Salle7.unity b/Maquette/Assets/Scenes/Salle7.unity
index fa846af05f921b95c520aa2444613b1a6840656d..7058f9d4874ad7c620cddb6fe6406349f13ae1b5 100644
--- a/Maquette/Assets/Scenes/Salle7.unity
+++ b/Maquette/Assets/Scenes/Salle7.unity
@@ -121,7 +121,7 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &72565612
+--- !u!1 &38427316
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -129,36 +129,117 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 72565613}
- - component: {fileID: 72565614}
+ - component: {fileID: 38427318}
+ - component: {fileID: 38427317}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!212 &38427317
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 38427316}
+ 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: 1
+ m_Sprite: {fileID: 21300000, guid: f08eb549d6dd74549bbb6fad3fdcf915, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 15.7, y: 10}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &38427318
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 38427316}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 308.4154}
+ 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 &270802197
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 270802198}
+ - component: {fileID: 270802199}
m_Layer: 9
- m_Name: Mur (5)
+ m_Name: Mur (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &72565613
+--- !u!4 &270802198
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 72565612}
+ m_GameObject: {fileID: 270802197}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 6.36, y: 3.9, z: -0.2957139}
- m_LocalScale: {x: 0.39999998, y: 2, z: 1.02}
+ m_LocalPosition: {x: -7, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
m_Children: []
- m_Father: {fileID: 1198220544}
- m_RootOrder: 5
+ m_Father: {fileID: 384519618}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &72565614
+--- !u!61 &270802199
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 72565612}
+ m_GameObject: {fileID: 270802197}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -176,9 +257,9 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
+ m_Size: {x: 1, y: 8}
m_EdgeRadius: 0
---- !u!1 &106900130
+--- !u!1 &384519617
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -186,36 +267,70 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 106900131}
- - component: {fileID: 106900132}
+ - component: {fileID: 384519618}
+ m_Layer: 0
+ m_Name: Murs
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &384519618
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 384519617}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -2.0453706}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 741687418}
+ - {fileID: 480706242}
+ - {fileID: 270802198}
+ - {fileID: 1558383376}
+ m_Father: {fileID: 1294997288}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &480706241
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 480706242}
+ - component: {fileID: 480706243}
m_Layer: 9
- m_Name: Mur(4)
+ m_Name: Mur (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &106900131
+--- !u!4 &480706242
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 106900130}
+ m_GameObject: {fileID: 480706241}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -5.9382496, y: 4.0284543, z: -0.14785695}
- m_LocalScale: {x: 0.4, y: 2, z: 1.02}
+ m_LocalPosition: {x: 0.53, y: 4.9, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1198220544}
- m_RootOrder: 4
+ m_Father: {fileID: 384519618}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &106900132
+--- !u!61 &480706243
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 106900130}
+ m_GameObject: {fileID: 480706241}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -331,7 +446,7 @@ Transform:
m_Children:
- {fileID: 1521708844}
m_Father: {fileID: 1294997288}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!156049354 &708120550
Grid:
@@ -345,7 +460,7 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
---- !u!1 &732702735
+--- !u!1 &741687417
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -353,36 +468,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 732702736}
- - component: {fileID: 732702737}
+ - component: {fileID: 741687418}
+ - component: {fileID: 741687419}
m_Layer: 9
- m_Name: Mur (3)
+ m_Name: Mur
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &732702736
+--- !u!4 &741687418
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 732702735}
+ m_GameObject: {fileID: 741687417}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 8.27, y: 0.19, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
+ m_LocalPosition: {x: 0.59, y: -5.1, z: 0}
+ m_LocalScale: {x: 2, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1198220544}
- m_RootOrder: 3
+ m_Father: {fileID: 384519618}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &732702737
+--- !u!61 &741687419
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 732702735}
+ m_GameObject: {fileID: 741687417}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
@@ -400,8 +515,54 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 1, y: 8}
+ m_Size: {x: 8.5, y: 1}
m_EdgeRadius: 0
+--- !u!1 &925353378
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 925353380}
+ - component: {fileID: 925353379}
+ m_Layer: 0
+ m_Name: InvisibleSpawner
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &925353379
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 925353378}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7de7b60712cf1fa44a8ba8db0e6e325e, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ duration: 5
+ Kamikaze: {fileID: 1847200226376073621, guid: 260cded7245744342bd2b83e5c3db0af,
+ type: 3}
+--- !u!4 &925353380
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 925353378}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 7, y: 4, z: -9.340413}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &939547183
GameObject:
m_ObjectHideFlags: 0
@@ -500,156 +661,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
---- !u!1 &947126695
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 947126696}
- - component: {fileID: 947126697}
- m_Layer: 9
- m_Name: Mur
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &947126696
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 947126695}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.59, y: -4.6, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1198220544}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &947126697
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 947126695}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
---- !u!1 &1140552311
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1140552312}
- - component: {fileID: 1140552313}
- m_Layer: 9
- m_Name: Mur (2)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1140552312
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1140552311}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -7.73, y: 0.30230787, z: 0}
- m_LocalScale: {x: 1, y: 1.2, z: 1}
- m_Children: []
- m_Father: {fileID: 1198220544}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1140552313
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1140552311}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 1, y: 8}
- m_EdgeRadius: 0
---- !u!1 &1198220543
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1198220544}
- m_Layer: 0
- m_Name: Murs
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1198220544
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1198220543}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.5482497, y: -0.46845418, z: -2.0453706}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 947126696}
- - {fileID: 1861171869}
- - {fileID: 1140552312}
- - {fileID: 732702736}
- - {fileID: 106900131}
- - {fileID: 72565613}
- m_Father: {fileID: 1294997288}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1294997287
GameObject:
m_ObjectHideFlags: 0
@@ -677,8 +688,8 @@ Transform:
m_LocalPosition: {x: -0.780414, y: 0.016146315, z: -0.14785685}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 384519618}
- {fileID: 708120549}
- - {fileID: 1198220544}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -755,7 +766,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
- orthographic size: 7
+ orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -3949,6 +3960,63 @@ Tilemap:
e31: 0
e32: 0
e33: 1
+--- !u!1 &1558383375
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1558383376}
+ - component: {fileID: 1558383377}
+ m_Layer: 9
+ m_Name: Mur (3)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1558383376
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1558383375}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 8.6, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1.4, z: 1}
+ m_Children: []
+ m_Father: {fileID: 384519618}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &1558383377
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1558383375}
+ 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}
+ m_SpriteTilingProperty:
+ border: {x: 0, y: 0, z: 0, w: 0}
+ pivot: {x: 0, y: 0}
+ oldSize: {x: 0, y: 0}
+ newSize: {x: 0, y: 0}
+ adaptiveTilingThreshold: 0
+ drawMode: 0
+ adaptiveTiling: 0
+ m_AutoTiling: 0
+ serializedVersion: 2
+ m_Size: {x: 1, y: 8}
+ m_EdgeRadius: 0
--- !u!1001 &1631110522
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3959,12 +4027,12 @@ PrefabInstance:
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0.08
+ value: -1
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
propertyPath: m_LocalPosition.y
- value: -0.28
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 9060317251694670712, guid: 36bef5cca7d1b4105b94230ca472edff,
type: 3}
@@ -4023,60 +4091,3 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 36bef5cca7d1b4105b94230ca472edff, type: 3}
---- !u!1 &1861171868
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1861171869}
- - component: {fileID: 1861171870}
- m_Layer: 9
- m_Name: Mur (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1861171869
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1861171868}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.53, y: 4.53, z: 0}
- m_LocalScale: {x: 2, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1198220544}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!61 &1861171870
-BoxCollider2D:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1861171868}
- 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}
- m_SpriteTilingProperty:
- border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0, y: 0}
- oldSize: {x: 0, y: 0}
- newSize: {x: 0, y: 0}
- adaptiveTilingThreshold: 0
- drawMode: 0
- adaptiveTiling: 0
- m_AutoTiling: 0
- serializedVersion: 2
- m_Size: {x: 8.5, y: 1}
- m_EdgeRadius: 0
diff --git a/Maquette/Assets/Scenes/Salle8.unity b/Maquette/Assets/Scenes/Salle8.unity
index 6658baab086bd8d0cc4f09eee3a5d46cbcfff4fc..7cc61ca4ccda1cc327a895945116ecee5f7f0182 100644
--- a/Maquette/Assets/Scenes/Salle8.unity
+++ b/Maquette/Assets/Scenes/Salle8.unity
@@ -463,6 +463,87 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!1 &1349182895
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1349182897}
+ - component: {fileID: 1349182896}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!212 &1349182896
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1349182895}
+ 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: 1443d31f0b999e94e8809c983d37b896, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 25.002125, y: 11.5}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &1349182897
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1349182895}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: -5.420195}
+ m_LocalScale: {x: 1.3, y: 1.3, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1774572127
GameObject:
m_ObjectHideFlags: 0
@@ -492,6 +573,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd2602917ecfb40c69251bb614eff6cd, type: 3}
m_Name:
m_EditorClassIdentifier:
+ target: 0
--- !u!4 &1774572129
Transform:
m_ObjectHideFlags: 0
diff --git a/Maquette/Assets/Scenes/Salle9.unity b/Maquette/Assets/Scenes/Salle9.unity
index 4e0c16400e7ed63f9611ecfec32043dc81a14dba..505290a3e60381f4c10a008bffe406be53e8b6b1 100644
--- a/Maquette/Assets/Scenes/Salle9.unity
+++ b/Maquette/Assets/Scenes/Salle9.unity
@@ -389,6 +389,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd2602917ecfb40c69251bb614eff6cd, type: 3}
m_Name:
m_EditorClassIdentifier:
+ target: 0
--- !u!4 &564480657
Transform:
m_ObjectHideFlags: 0
@@ -403,6 +404,87 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &612059946
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 612059948}
+ - component: {fileID: 612059947}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!212 &612059947
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 612059946}
+ 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: f99c0cb9fb5557d40826890d343c818a, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
+ m_DrawMode: 0
+ m_Size: {x: 25.002125, y: 11.5}
+ m_AdaptiveModeThreshold: 0.5
+ m_SpriteTileMode: 0
+ m_WasSpriteAssigned: 1
+ m_MaskInteraction: 0
+ m_SpriteSortPoint: 0
+--- !u!4 &612059948
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 612059946}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.3, y: 1.3, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1444469343
GameObject:
m_ObjectHideFlags: 0
diff --git a/Maquette/Assets/Scripts/BobbyMover.cs b/Maquette/Assets/Scripts/BobbyMover.cs
index e06013207f74e9bb03a3d341294f20ad38bb6f2e..e82b672e28b587afb3cfaea98bf1f2b8ab33145a 100644
--- a/Maquette/Assets/Scripts/BobbyMover.cs
+++ b/Maquette/Assets/Scripts/BobbyMover.cs
@@ -11,7 +11,7 @@ public class BobbyMover : MonoBehaviour
public float speedbonus;
private Vector2 direction;
public static BobbyMover instance;
- float angle = 0;
+ public float angle = 0;
public WeaponData weapons;
private Weapon weapon;
public Text Speedtext;
diff --git a/Maquette/Assets/Scripts/ClydeMover.cs b/Maquette/Assets/Scripts/ClydeMover.cs
index aa65182812384228b83b8a64afca6b99a667fd71..d66a6e299ef2b10e286bd552cbdf1b6acacf5552 100644
--- a/Maquette/Assets/Scripts/ClydeMover.cs
+++ b/Maquette/Assets/Scripts/ClydeMover.cs
@@ -9,7 +9,7 @@ public class ClydeMover : MonoBehaviour
private Rigidbody2D body;
public float speedbonus;
public Vector2 direction;
- float angle = 0;
+ public float angle = 0;
public Text Speedtext;
void Awake() {
diff --git a/Maquette/Assets/Scripts/LifeBobby.cs b/Maquette/Assets/Scripts/LifeBobby.cs
index 438d127b0097453dcc076a074c19fcd3df682f6b..b7f09cb9d1855f0c62622b70efe51ee46975b306 100644
--- a/Maquette/Assets/Scripts/LifeBobby.cs
+++ b/Maquette/Assets/Scripts/LifeBobby.cs
@@ -57,7 +57,6 @@ public class LifeBobby : MonoBehaviour
}
public void Die(){
- count_life = 0;
Destroy(gameObject);
portal.instance.bobbydead = true;
Player.GetComponent<players>().isbobbydead = true;
@@ -87,7 +86,11 @@ public class LifeBobby : MonoBehaviour
}
public void rewrite(){
- Lifetext.text = count_life.ToString() + "/" + maxHealth.ToString();
+ if (count_life >= 0){
+ Lifetext.text = count_life.ToString() + "/" + maxHealth.ToString();
+ }
+ else
+ {Lifetext.text = "0/" + maxHealth.ToString();}
}
public void Downgrade(float x){
diff --git a/Maquette/Assets/Scripts/LifeClyde.cs b/Maquette/Assets/Scripts/LifeClyde.cs
index 03fdeb0986b1e9df6e829588c04008ecec2fe665..1229c673de2d6b27bfe7d605f1d192351baf4c4d 100644
--- a/Maquette/Assets/Scripts/LifeClyde.cs
+++ b/Maquette/Assets/Scripts/LifeClyde.cs
@@ -55,7 +55,6 @@ public class LifeClyde : MonoBehaviour
}
public void Die(){
- count_life = 0;
Destroy(gameObject);
portal.instance.bobbydead = true;
Player.GetComponent<players>().isbobbydead = true;
@@ -84,7 +83,11 @@ public class LifeClyde : MonoBehaviour
}
public void rewrite(){
- Lifetext.text = count_life.ToString() + "/" + maxHealth.ToString();
+ if (count_life >= 0){
+ Lifetext.text = count_life.ToString() + "/" + maxHealth.ToString();
+ }
+ else
+ {Lifetext.text = "0/" + maxHealth.ToString();}
}
diff --git a/Maquette/Assets/Scripts/MoveVillain.cs b/Maquette/Assets/Scripts/MoveVillain.cs
index 114071cf33c462a5835f377bb95258e6714534c6..5c7ef2c1aafb8a87db973787d91476edaab43ae0 100644
--- a/Maquette/Assets/Scripts/MoveVillain.cs
+++ b/Maquette/Assets/Scripts/MoveVillain.cs
@@ -15,7 +15,7 @@ public class MoveVillain : MonoBehaviour
public GameObject[] Players;
public float speed = (float)1;
public float rotatespeed;
- private float angle;
+ public float angle;
void Awake()
{
diff --git a/Maquette/Assets/Scripts/Pistol.cs b/Maquette/Assets/Scripts/Pistol.cs
index 1b1b4356cad4dd2ed33da57ed4e8a426de1d1e37..2a99d4e8c078ca9f75e599c18b1fafe5a66df9f2 100644
--- a/Maquette/Assets/Scripts/Pistol.cs
+++ b/Maquette/Assets/Scripts/Pistol.cs
@@ -67,12 +67,10 @@ public class Pistol : MonoBehaviour
}
else{
Instantiate(projectile, FirePoint.position , FirePoint.transform.rotation);
- Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, -3)*FirePoint.transform.rotation);
- Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, 3)*FirePoint.transform.rotation);
Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, -6)*FirePoint.transform.rotation);
Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, 6)*FirePoint.transform.rotation);
- Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, -9)*FirePoint.transform.rotation);
- Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, 9)*FirePoint.transform.rotation);
+ Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, -12)*FirePoint.transform.rotation);
+ Instantiate(projectile, FirePoint.position , Quaternion.Euler(0, 0, 12)*FirePoint.transform.rotation);
cooldown = true;
timer = cadence;
}
diff --git a/Maquette/Assets/Scripts/TowerShooter.cs b/Maquette/Assets/Scripts/TowerShooter.cs
index 910561d6fe12f28a6fc3067636efc8e4b6cfad7d..c98c60c86afea4e24eb25ff6dadbcadd11ea8d5c 100644
--- a/Maquette/Assets/Scripts/TowerShooter.cs
+++ b/Maquette/Assets/Scripts/TowerShooter.cs
@@ -7,11 +7,13 @@ public class TowerShooter : MonoBehaviour
public Transform FirePointTower;
public GameObject Bullet;
public Rigidbody2D Tower;
- float angle = 0;
- float speed = 50;
- bool cooldown = false;
- int cooltime = 0;
+ void awake(){
+ public float angle;
+ float speed = 50;
+ bool cooldown = false;
+ int cooltime = 0;
+ }
// Start is called before the first frame update
diff --git a/Maquette/Assets/SelfDestruct.cs b/Maquette/Assets/SelfDestruct.cs
new file mode 100644
index 0000000000000000000000000000000000000000..26da12429e54cb0ecd480492c5e55bcfd94d325c
--- /dev/null
+++ b/Maquette/Assets/SelfDestruct.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SelfDestruct : MonoBehaviour
+{
+
+
+ public float duration;
+
+
+ IEnumerator Start(){
+
+ yield return new WaitForSeconds(duration);
+ Destroy(gameObject);
+ }
+
+}
diff --git a/Maquette/Assets/SelfDestruct.cs.meta b/Maquette/Assets/SelfDestruct.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..9ce7ae93117a40c13a231d1dc197a6b12c25b6ae
--- /dev/null
+++ b/Maquette/Assets/SelfDestruct.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0ce8e766cca3c0d4688272f10702dbdc
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Shot.png b/Maquette/Assets/Shot.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6d8e9cd4bbb0fd0b7d7b69fc1996e78b71e9167
Binary files /dev/null and b/Maquette/Assets/Shot.png differ
diff --git a/Maquette/Assets/Shot.png.meta b/Maquette/Assets/Shot.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d7bf53eea2190a8a00cc1de2d67a3a8811b31db1
--- /dev/null
+++ b/Maquette/Assets/Shot.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f11b1717c26eb8a4b8b8f305ee4756a0
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Shotgun.png b/Maquette/Assets/Shotgun.png
new file mode 100644
index 0000000000000000000000000000000000000000..5399d3d9ab364e0df7bbebc9a600fd8f66a9c9ee
Binary files /dev/null and b/Maquette/Assets/Shotgun.png differ
diff --git a/Maquette/Assets/Shotgun.png.meta b/Maquette/Assets/Shotgun.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..984aa18a3fa8ed5b53d96a3d199b5e57e327dd52
--- /dev/null
+++ b/Maquette/Assets/Shotgun.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 4a95412eeb157e346ad838e008237b7c
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Sprites/Aseprite/Bobby all.png.meta b/Maquette/Assets/Sprites/Aseprite/Bobby all.png.meta
index 65ddac474b502c84b18e8d3f98de53f66b8e8a38..e2f12963cc922b1a4f28a3bb65e2e97e55fa31fd 100644
--- a/Maquette/Assets/Sprites/Aseprite/Bobby all.png.meta
+++ b/Maquette/Assets/Sprites/Aseprite/Bobby all.png.meta
@@ -1,7 +1,55 @@
fileFormatVersion: 2
guid: ef53a46b04457874285e9a85c34305b7
TextureImporter:
- internalIDToNameTable: []
+ internalIDToNameTable:
+ - first:
+ 213: 2092770887557905109
+ second: Bobby all_0
+ - first:
+ 213: -4508802689790340033
+ second: Bobby all_1
+ - first:
+ 213: -7923785759495430964
+ second: Bobby all_2
+ - first:
+ 213: -356587150414357140
+ second: Bobby all_3
+ - first:
+ 213: 4700393565594389827
+ second: Bobby all_4
+ - first:
+ 213: -2495348672860257905
+ second: Bobby all_5
+ - first:
+ 213: 3123993412194684718
+ second: Bobby all_6
+ - first:
+ 213: -6668228949919029502
+ second: Bobby all_7
+ - first:
+ 213: -7562690943845799573
+ second: Bobby all_0
+ - first:
+ 213: 5551286220974478937
+ second: Bobby all_1
+ - first:
+ 213: -1280340934883224679
+ second: Bobby all_2
+ - first:
+ 213: 4412834770253259978
+ second: Bobby all_3
+ - first:
+ 213: 6195979084386785971
+ second: Bobby all_4
+ - first:
+ 213: 6770317232385001316
+ second: Bobby all_5
+ - first:
+ 213: -3397886345182840640
+ second: Bobby all_6
+ - first:
+ 213: 535473899359185522
+ second: Bobby all_7
externalObjects: {}
serializedVersion: 11
mipmaps:
@@ -40,7 +88,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 1
+ spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -71,9 +119,189 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
- sprites: []
+ sprites:
+ - serializedVersion: 2
+ name: Bobby all_0
+ rect:
+ serializedVersion: 2
+ x: 50
+ y: 460
+ width: 120
+ height: 150
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: b69e10ac7aceb0790800000000000000
+ internalID: -7562690943845799573
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Bobby all_1
+ rect:
+ serializedVersion: 2
+ x: 30
+ y: 370
+ width: 150
+ height: 80
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 95654bfe7612a0d40800000000000000
+ internalID: 5551286220974478937
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Bobby all_2
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 280
+ width: 140
+ height: 80
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 993d4e804b05b3ee0800000000000000
+ internalID: -1280340934883224679
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Bobby all_3
+ rect:
+ serializedVersion: 2
+ x: 150
+ y: 320
+ width: 10
+ height: 10
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: ac42075e7d98d3d30800000000000000
+ internalID: 4412834770253259978
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Bobby all_4
+ rect:
+ serializedVersion: 2
+ x: 160
+ y: 300
+ width: 10
+ height: 10
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 3badf98462a8cf550800000000000000
+ internalID: 6195979084386785971
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Bobby all_5
+ rect:
+ serializedVersion: 2
+ x: 50
+ y: 180
+ width: 50
+ height: 90
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 4678305f6aff4fd50800000000000000
+ internalID: 6770317232385001316
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Bobby all_6
+ rect:
+ serializedVersion: 2
+ x: 10
+ y: 90
+ width: 160
+ height: 80
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 0c8f9303f5848d0d0800000000000000
+ internalID: -3397886345182840640
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Bobby all_7
+ rect:
+ serializedVersion: 2
+ x: 20
+ y: 0
+ width: 150
+ height: 80
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 27a2cc5aca26e6700800000000000000
+ internalID: 535473899359185522
+ vertices: []
+ indices:
+ edges: []
+ weights: []
outline: []
physicsShape: []
bones: []
diff --git a/Maquette/Assets/Sprites/Aseprite/Clyde all.png.meta b/Maquette/Assets/Sprites/Aseprite/Clyde all.png.meta
index 6a59118ee649977441b348d0144d78152e8894c0..021ee1b98a43951c63c1b2c447d11856300ae85e 100644
--- a/Maquette/Assets/Sprites/Aseprite/Clyde all.png.meta
+++ b/Maquette/Assets/Sprites/Aseprite/Clyde all.png.meta
@@ -1,7 +1,31 @@
fileFormatVersion: 2
guid: e413be8661b25e04fbfe87715ccc7b05
TextureImporter:
- internalIDToNameTable: []
+ internalIDToNameTable:
+ - first:
+ 213: -7759127601464346676
+ second: Clyde all_0
+ - first:
+ 213: 3163984606673106782
+ second: Clyde all_1
+ - first:
+ 213: -7911417051502293210
+ second: Clyde all_2
+ - first:
+ 213: 1032521226515099703
+ second: Clyde all_3
+ - first:
+ 213: -2064079152113674363
+ second: Clyde all_4
+ - first:
+ 213: -8821246903848866948
+ second: Clyde all_5
+ - first:
+ 213: 7369475662483389385
+ second: Clyde all_6
+ - first:
+ 213: 798241067041979410
+ second: Clyde all_7
externalObjects: {}
serializedVersion: 11
mipmaps:
@@ -40,7 +64,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 1
+ spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -71,9 +95,189 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
- sprites: []
+ sprites:
+ - serializedVersion: 2
+ name: Clyde all_0
+ rect:
+ serializedVersion: 2
+ x: 30
+ y: 460
+ width: 120
+ height: 150
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: cc7f9cb5e8a025490800000000000000
+ internalID: -7759127601464346676
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Clyde all_1
+ rect:
+ serializedVersion: 2
+ x: 10
+ y: 370
+ width: 150
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: e57fd8b7c3bb8eb20800000000000000
+ internalID: 3163984606673106782
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Clyde all_2
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 280
+ width: 140
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 62fcc3fab10053290800000000000000
+ internalID: -7911417051502293210
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Clyde all_3
+ rect:
+ serializedVersion: 2
+ x: 150
+ y: 320
+ width: 10
+ height: 10
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 730bb71c590445e00800000000000000
+ internalID: 1032521226515099703
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Clyde all_4
+ rect:
+ serializedVersion: 2
+ x: 160
+ y: 300
+ width: 10
+ height: 10
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 58799f572faea53e0800000000000000
+ internalID: -2064079152113674363
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Clyde all_5
+ rect:
+ serializedVersion: 2
+ x: 50
+ y: 180
+ width: 50
+ height: 90
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: c7be21c8da2a49580800000000000000
+ internalID: -8821246903848866948
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Clyde all_6
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 90
+ width: 160
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 9cb7533e113a54660800000000000000
+ internalID: 7369475662483389385
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Clyde all_7
+ rect:
+ serializedVersion: 2
+ x: 10
+ y: 0
+ width: 150
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 21c7a2e650ce31b00800000000000000
+ internalID: 798241067041979410
+ vertices: []
+ indices:
+ edges: []
+ weights: []
outline: []
physicsShape: []
bones: []
diff --git a/Maquette/Assets/Sprites/Aseprite/Hatches.png b/Maquette/Assets/Sprites/Aseprite/Hatches.png
index f72aa8f4e917739dc6c24b1c856271d19e73115a..39be95cb49fd1aa83c0cbe6b83ce3f226667546b 100644
Binary files a/Maquette/Assets/Sprites/Aseprite/Hatches.png and b/Maquette/Assets/Sprites/Aseprite/Hatches.png differ
diff --git a/Maquette/Assets/Sprites/Aseprite/Hatches.png.meta b/Maquette/Assets/Sprites/Aseprite/Hatches.png.meta
index 2a2fe467f803da2f6a04e35427e041eed3875f46..9bd8563d3d7e2adad8efacbf0035ea104792d785 100644
--- a/Maquette/Assets/Sprites/Aseprite/Hatches.png.meta
+++ b/Maquette/Assets/Sprites/Aseprite/Hatches.png.meta
@@ -1,7 +1,94 @@
fileFormatVersion: 2
guid: 20087621c7d88b740a4eedc76cf6e9b1
TextureImporter:
- internalIDToNameTable: []
+ internalIDToNameTable:
+ - first:
+ 213: 7560749161186844325
+ second: Hatches_0
+ - first:
+ 213: 570604127520474917
+ second: Hatches_1
+ - first:
+ 213: -2953038295524498037
+ second: Hatches_0
+ - first:
+ 213: 7344500078387394495
+ second: Hatches_1
+ - first:
+ 213: -2947790897295647003
+ second: Hatches_2
+ - first:
+ 213: 7678546642990158583
+ second: Hatches_3
+ - first:
+ 213: -2006153300675854129
+ second: Hatches_4
+ - first:
+ 213: -6541838375042869650
+ second: Hatches_5
+ - first:
+ 213: 364360196296165230
+ second: Hatches_6
+ - first:
+ 213: 2453669495560634807
+ second: Hatches_7
+ - first:
+ 213: 4053815896987536237
+ second: Hatches_8
+ - first:
+ 213: 4253578527889352867
+ second: Hatches_9
+ - first:
+ 213: -3152357162272638027
+ second: Hatches_10
+ - first:
+ 213: -664750023827595887
+ second: Hatches_11
+ - first:
+ 213: -7296212843862192337
+ second: Hatches_12
+ - first:
+ 213: 2398381066519092156
+ second: Hatches_13
+ - first:
+ 213: 3854322783343133095
+ second: Hatches_14
+ - first:
+ 213: 4655158575739312986
+ second: Hatches_15
+ - first:
+ 213: 4098935106643410544
+ second: Hatches_16
+ - first:
+ 213: -7176632834647230182
+ second: Hatches_17
+ - first:
+ 213: -4444304822975978059
+ second: Hatches_18
+ - first:
+ 213: 5951203853015782511
+ second: Hatches_19
+ - first:
+ 213: -6599186458635943353
+ second: Hatches_20
+ - first:
+ 213: 2164695224943958395
+ second: Hatches_21
+ - first:
+ 213: -6591226363909123105
+ second: Hatches_22
+ - first:
+ 213: -5852889275959145520
+ second: Hatches_23
+ - first:
+ 213: -5143538512241472361
+ second: Hatches_24
+ - first:
+ 213: 6464995999227676766
+ second: Hatches_25
+ - first:
+ 213: 6959379278843847625
+ second: Hatches_26
externalObjects: {}
serializedVersion: 11
mipmaps:
@@ -40,7 +127,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 1
+ spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -71,9 +158,63 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
- sprites: []
+ sprites:
+ - serializedVersion: 2
+ name: Hatches_0
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 230
+ width: 390
+ height: 190
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: b85232be053b407d0800000000000000
+ internalID: -2953038295524498037
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Hatches_1
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 390
+ height: 190
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 527ca384e613be700800000000000000
+ internalID: 570604127520474917
+ vertices: []
+ indices:
+ edges: []
+ weights: []
outline: []
physicsShape: []
bones: []
diff --git a/Maquette/Assets/Sprites/Aseprite/Intro.png b/Maquette/Assets/Sprites/Aseprite/Intro.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ac9e938319280eff85f9e110f08edc0a97e8c27
Binary files /dev/null and b/Maquette/Assets/Sprites/Aseprite/Intro.png differ
diff --git a/Maquette/Assets/Sprites/Aseprite/Intro.png.meta b/Maquette/Assets/Sprites/Aseprite/Intro.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2db1b9912fb76e50be8c3e896df500731187d835
--- /dev/null
+++ b/Maquette/Assets/Sprites/Aseprite/Intro.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 63f59587c05f46047bb610987f2141cf
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Sprites/Aseprite/Magot.png b/Maquette/Assets/Sprites/Aseprite/Magot.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3cd912a37d7b88a0ffe7f33120ac3db0beb2795
Binary files /dev/null and b/Maquette/Assets/Sprites/Aseprite/Magot.png differ
diff --git a/Maquette/Assets/Sprites/Aseprite/Magot.png.meta b/Maquette/Assets/Sprites/Aseprite/Magot.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..661f99707002ebb4f0522883e970b524cd38d0b5
--- /dev/null
+++ b/Maquette/Assets/Sprites/Aseprite/Magot.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 025eed5f0e115b942aada56e4964636f
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Sprites/Aseprite/Sol.png b/Maquette/Assets/Sprites/Aseprite/Sol.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3ab4ce64dd672c8989f04420bae8e330adcd797
Binary files /dev/null and b/Maquette/Assets/Sprites/Aseprite/Sol.png differ
diff --git a/Maquette/Assets/Sprites/Aseprite/Sol.png.meta b/Maquette/Assets/Sprites/Aseprite/Sol.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..add099bbe74a0633618c573562a8ca0c7acafba7
--- /dev/null
+++ b/Maquette/Assets/Sprites/Aseprite/Sol.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: f08eb549d6dd74549bbb6fad3fdcf915
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Sprites/Aseprite/Turret.png b/Maquette/Assets/Sprites/Aseprite/Turret.png
index 965b3fe48958de8b8b553c364b4d4f10600080b7..81350e7a72040e006200ab96db3e82638e78b5f9 100644
Binary files a/Maquette/Assets/Sprites/Aseprite/Turret.png and b/Maquette/Assets/Sprites/Aseprite/Turret.png differ
diff --git a/Maquette/Assets/Sprites/Aseprite/Turret.png.meta b/Maquette/Assets/Sprites/Aseprite/Turret.png.meta
index 6e23f1e2ded04e99e79a6e1c20dc27d8933fa698..543d206b3d5354a7440615f5c7830903dcc5782d 100644
--- a/Maquette/Assets/Sprites/Aseprite/Turret.png.meta
+++ b/Maquette/Assets/Sprites/Aseprite/Turret.png.meta
@@ -71,6 +71,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/Maquette/Assets/Upgrade LP.png b/Maquette/Assets/Upgrade LP.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c05657bab5ba6c81ec8aff0192a4c712261caf0
Binary files /dev/null and b/Maquette/Assets/Upgrade LP.png differ
diff --git a/Maquette/Assets/Upgrade LP.png.meta b/Maquette/Assets/Upgrade LP.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..24f4de2671b8231939ecd229302ffd1e3e492eff
--- /dev/null
+++ b/Maquette/Assets/Upgrade LP.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 0167683f6aa16224e9670701ffcadbd1
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Upgrade attack speed.png b/Maquette/Assets/Upgrade attack speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..22ca29e811b8cbe6f61d9f22679898e3e4d87f24
Binary files /dev/null and b/Maquette/Assets/Upgrade attack speed.png differ
diff --git a/Maquette/Assets/Upgrade attack speed.png.meta b/Maquette/Assets/Upgrade attack speed.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f73cf5360ce52d38670f710a2d7934cef5650489
--- /dev/null
+++ b/Maquette/Assets/Upgrade attack speed.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 11edea8d38c917c45baf939f6d85a6f4
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Upgrade damage.png b/Maquette/Assets/Upgrade damage.png
new file mode 100644
index 0000000000000000000000000000000000000000..202967bbbcf203725d2ae481a42e0745b901aad7
Binary files /dev/null and b/Maquette/Assets/Upgrade damage.png differ
diff --git a/Maquette/Assets/Upgrade damage.png.meta b/Maquette/Assets/Upgrade damage.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..612987dc591305675f13752a677ee957bdbfe3ea
--- /dev/null
+++ b/Maquette/Assets/Upgrade damage.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 5ccdb94b8bf7eee4f863eba700f7aa22
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Upgrade move speed.png b/Maquette/Assets/Upgrade move speed.png
new file mode 100644
index 0000000000000000000000000000000000000000..0163672957863af75c3c030d654f4d9ce5dd6eef
Binary files /dev/null and b/Maquette/Assets/Upgrade move speed.png differ
diff --git a/Maquette/Assets/Upgrade move speed.png.meta b/Maquette/Assets/Upgrade move speed.png.meta
new file mode 100644
index 0000000000000000000000000000000000000000..01c05f18c32c6b094936ee394fdebb146ac4105e
--- /dev/null
+++ b/Maquette/Assets/Upgrade move speed.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 393c9ed6352a2b34e8eff1a65ba358af
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 11
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: -1
+ aniso: -1
+ mipBias: -100
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ applyGammaDecoding: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/Villain all.png.meta b/Maquette/Assets/Villain all.png.meta
index 26ca4efc3b17755929c0b2cf89b8afdba246dce7..c637a0186bd30032ae7a93aea76c00ead26bccb9 100644
--- a/Maquette/Assets/Villain all.png.meta
+++ b/Maquette/Assets/Villain all.png.meta
@@ -1,7 +1,31 @@
fileFormatVersion: 2
guid: ff4a2750a361c7d4592c5be2222b8439
TextureImporter:
- internalIDToNameTable: []
+ internalIDToNameTable:
+ - first:
+ 213: -3367637054651279780
+ second: Villain all_0
+ - first:
+ 213: -953368578020683905
+ second: Villain all_1
+ - first:
+ 213: -5357878499522019224
+ second: Villain all_2
+ - first:
+ 213: 8783032656350410132
+ second: Villain all_3
+ - first:
+ 213: -7788188398696996828
+ second: Villain all_4
+ - first:
+ 213: -570185644455300027
+ second: Villain all_5
+ - first:
+ 213: -1724357997688239666
+ second: Villain all_6
+ - first:
+ 213: -5359032462696723666
+ second: Villain all_7
externalObjects: {}
serializedVersion: 11
mipmaps:
@@ -40,7 +64,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 1
+ spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -71,9 +95,189 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
- sprites: []
+ sprites:
+ - serializedVersion: 2
+ name: Villain all_0
+ rect:
+ serializedVersion: 2
+ x: 20
+ y: 460
+ width: 120
+ height: 150
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: c565119f0ffb341d0800000000000000
+ internalID: -3367637054651279780
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Villain all_1
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 370
+ width: 150
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: f7fce075454f4c2f0800000000000000
+ internalID: -953368578020683905
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Villain all_2
+ rect:
+ serializedVersion: 2
+ x: 10
+ y: 280
+ width: 140
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 860894654edf4a5b0800000000000000
+ internalID: -5357878499522019224
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Villain all_3
+ rect:
+ serializedVersion: 2
+ x: 160
+ y: 320
+ width: 10
+ height: 10
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 495fb6c9aa993e970800000000000000
+ internalID: 8783032656350410132
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Villain all_4
+ rect:
+ serializedVersion: 2
+ x: 170
+ y: 300
+ width: 10
+ height: 10
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 420e8db3aebcae390800000000000000
+ internalID: -7788188398696996828
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Villain all_5
+ rect:
+ serializedVersion: 2
+ x: 60
+ y: 180
+ width: 50
+ height: 90
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 544f6366d2b4618f0800000000000000
+ internalID: -570185644455300027
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Villain all_6
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 90
+ width: 160
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: ec940328989d118e0800000000000000
+ internalID: -1724357997688239666
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ - serializedVersion: 2
+ name: Villain all_7
+ rect:
+ serializedVersion: 2
+ x: 10
+ y: 0
+ width: 150
+ height: 80
+ alignment: 0
+ pivot: {x: 0, y: 0}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: e2bcc295e54e0a5b0800000000000000
+ internalID: -5359032462696723666
+ vertices: []
+ indices:
+ edges: []
+ weights: []
outline: []
physicsShape: []
bones: []
diff --git a/Maquette/Assets/portal.cs b/Maquette/Assets/portal.cs
index f9049db729a4f2fb44411680f83a421b601692ab..82a081e80d887ea080301fc3a1f91717b2fd80e7 100644
--- a/Maquette/Assets/portal.cs
+++ b/Maquette/Assets/portal.cs
@@ -95,12 +95,12 @@ public class portal : MonoBehaviour
if(bobbydead){
image.sprite = opensprite;
isopen = true;
- next = 8;
+ next = 9;
}
if(clydedead){
image.sprite = opensprite;
isopen = true;
- next = 9;
+ next = 8;
}
}
}
diff --git a/Maquette/Assets/prefabs/Bullet.prefab b/Maquette/Assets/prefabs/Bullet.prefab
index 3ae470ef6c7dd05c2c30e353ac5a978cc570ba26..d23c283897865a493475fcf89e551eb099c571b4 100644
--- a/Maquette/Assets/prefabs/Bullet.prefab
+++ b/Maquette/Assets/prefabs/Bullet.prefab
@@ -72,7 +72,7 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 507560563
- m_SortingLayer: 4
+ m_SortingLayer: 5
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 2bb34006ab6ae4397b36b036f91857b1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Maquette/Assets/Carpet.prefab b/Maquette/Assets/prefabs/Carpet.prefab
similarity index 95%
rename from Maquette/Assets/Carpet.prefab
rename to Maquette/Assets/prefabs/Carpet.prefab
index 7e2ca06691b1deab879a139020843c9af59ec0b7..adee02f7afc45bad6278488daf97d9eb78f39c75 100644
--- a/Maquette/Assets/Carpet.prefab
+++ b/Maquette/Assets/prefabs/Carpet.prefab
@@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 1998599832797129962}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.4, y: 0, z: 0}
- m_LocalScale: {x: 1.1962553, y: 1.1962553, z: 1.1962553}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -67,8 +67,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 702145399
- m_SortingLayer: 3
+ m_SortingLayerID: 977193351
+ m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 7a39d5cf148056c4c9deeb699388e295, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Maquette/Assets/Carpet.prefab.meta b/Maquette/Assets/prefabs/Carpet.prefab.meta
similarity index 100%
rename from Maquette/Assets/Carpet.prefab.meta
rename to Maquette/Assets/prefabs/Carpet.prefab.meta
diff --git a/Maquette/Assets/Cash.prefab b/Maquette/Assets/prefabs/Cash.prefab
similarity index 92%
rename from Maquette/Assets/Cash.prefab
rename to Maquette/Assets/prefabs/Cash.prefab
index a0d79099d98abff3c1ff69ad78e2af4c3180fadb..ff338f352f8ee4a564ce069a487d73c8cc59e50e 100644
--- a/Maquette/Assets/Cash.prefab
+++ b/Maquette/Assets/prefabs/Cash.prefab
@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 5902828749815425179}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.4, y: -0.41, z: 0}
- m_LocalScale: {x: 0.08, y: 0.08, z: 1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -46,18 +46,18 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0.22830689, y: -0.22828484}
+ 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: 5.12, y: 5.12}
+ oldSize: {x: 0.7, y: 1}
newSize: {x: 5.12, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
- m_AutoTiling: 0
+ m_AutoTiling: 1
serializedVersion: 2
- m_Size: {x: 4.8051786, y: 3.5875902}
+ m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!212 &5902828749815425176
SpriteRenderer:
@@ -98,7 +98,7 @@ SpriteRenderer:
m_SortingLayerID: -427479191
m_SortingLayer: 4
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9c7b5a817d22145d3bbb55f37f33a48d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 025eed5f0e115b942aada56e4964636f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
diff --git a/Maquette/Assets/Cash.prefab.meta b/Maquette/Assets/prefabs/Cash.prefab.meta
similarity index 100%
rename from Maquette/Assets/Cash.prefab.meta
rename to Maquette/Assets/prefabs/Cash.prefab.meta
diff --git a/Maquette/Assets/DeadDog.prefab b/Maquette/Assets/prefabs/DeadDog.prefab
similarity index 100%
rename from Maquette/Assets/DeadDog.prefab
rename to Maquette/Assets/prefabs/DeadDog.prefab
diff --git a/Maquette/Assets/DeadDog.prefab.meta b/Maquette/Assets/prefabs/DeadDog.prefab.meta
similarity index 100%
rename from Maquette/Assets/DeadDog.prefab.meta
rename to Maquette/Assets/prefabs/DeadDog.prefab.meta
diff --git a/Maquette/Assets/DmgBonus.prefab b/Maquette/Assets/prefabs/DmgBonus.prefab
similarity index 93%
rename from Maquette/Assets/DmgBonus.prefab
rename to Maquette/Assets/prefabs/DmgBonus.prefab
index c18964a8859ed9b43dc9caca850ad908bfb9c1f4..e94323653a49ba168dfcc81374bf9e4825bdfcc9 100644
--- a/Maquette/Assets/DmgBonus.prefab
+++ b/Maquette/Assets/prefabs/DmgBonus.prefab
@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 1027322918830954503}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.01, y: -2.39, z: 0}
- m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_LocalScale: {x: 1, y: 1, z: 0.1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -69,10 +69,10 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: 702145399
+ m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9b062f3e398014758aa234aa04a141f1, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 5ccdb94b8bf7eee4f863eba700f7aa22, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -100,14 +100,14 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 8, y: 8.11}
+ oldSize: {x: 0.9, y: 1}
newSize: {x: 8, y: 8.11}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 11, y: 11}
+ m_Size: {x: 1.5, y: 1.5}
m_EdgeRadius: 0
--- !u!114 &1027322918830954500
MonoBehaviour:
diff --git a/Maquette/Assets/DmgBonus.prefab.meta b/Maquette/Assets/prefabs/DmgBonus.prefab.meta
similarity index 100%
rename from Maquette/Assets/DmgBonus.prefab.meta
rename to Maquette/Assets/prefabs/DmgBonus.prefab.meta
diff --git a/Maquette/Assets/Dog.prefab b/Maquette/Assets/prefabs/Dog.prefab
similarity index 100%
rename from Maquette/Assets/Dog.prefab
rename to Maquette/Assets/prefabs/Dog.prefab
diff --git a/Maquette/Assets/Dog.prefab.meta b/Maquette/Assets/prefabs/Dog.prefab.meta
similarity index 100%
rename from Maquette/Assets/Dog.prefab.meta
rename to Maquette/Assets/prefabs/Dog.prefab.meta
diff --git a/Maquette/Assets/prefabs/Explosion.prefab b/Maquette/Assets/prefabs/Explosion.prefab
index cd676fcb3efe40d03b4e5ec46e841b16b575db99..2273ac214298fc8c2891723e684e7c00b1b6bbb8 100644
--- a/Maquette/Assets/prefabs/Explosion.prefab
+++ b/Maquette/Assets/prefabs/Explosion.prefab
@@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 1535543990697259970}
- component: {fileID: 4568538281844072199}
- component: {fileID: 3490208022334396596}
+ - component: {fileID: 1865659075149085850}
m_Layer: 0
m_Name: Explosion
m_TagString: DamageMaker
@@ -126,3 +127,22 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
damage: 300
+--- !u!95 &1865659075149085850
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5141489527656997565}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 0}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorControllerStateOnDisable: 0
diff --git a/Maquette/Assets/Fire.prefab b/Maquette/Assets/prefabs/Fire.prefab
similarity index 93%
rename from Maquette/Assets/Fire.prefab
rename to Maquette/Assets/prefabs/Fire.prefab
index f9c711b49cac16faff51fa07dec221f269b05def..36037c661c44b671c4df23aa921a3b813105e9f9 100644
--- a/Maquette/Assets/Fire.prefab
+++ b/Maquette/Assets/prefabs/Fire.prefab
@@ -28,7 +28,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1108585196645417187}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.713, y: -2.073, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -73,7 +73,7 @@ SpriteRenderer:
m_SortingLayerID: 507560563
m_SortingLayer: 5
m_SortingOrder: 0
- m_Sprite: {fileID: -4029872243472812082, guid: 849865f84c95f419cac0e4f041d9c016,
+ m_Sprite: {fileID: 1535082918638315374, guid: 6b9f4694f53ca084590a1a789aebb46f,
type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@@ -98,18 +98,18 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0, y: 1.1637421}
+ m_Offset: {x: 0, y: 0.2}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
- pivot: {x: 0.5, y: 0}
- oldSize: {x: 1.35, y: 2.5}
+ pivot: {x: 0.5, y: 0.5}
+ oldSize: {x: 0.9, y: 1.8}
newSize: {x: 0.27, y: 0.5}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 1.35, y: 2.2778745}
+ m_Size: {x: 1, y: 1.5}
m_EdgeRadius: 0
--- !u!95 &1108585196645417184
Animator:
diff --git a/Maquette/Assets/Fire.prefab.meta b/Maquette/Assets/prefabs/Fire.prefab.meta
similarity index 100%
rename from Maquette/Assets/Fire.prefab.meta
rename to Maquette/Assets/prefabs/Fire.prefab.meta
diff --git a/Maquette/Assets/prefabs/Grenade.prefab b/Maquette/Assets/prefabs/Grenade.prefab
index e2580dcb63bff1713456b2ad24b43932550c087c..ce824e0c7874ed73774a2f593db3ea0fccfd4e4a 100644
--- a/Maquette/Assets/prefabs/Grenade.prefab
+++ b/Maquette/Assets/prefabs/Grenade.prefab
@@ -30,7 +30,7 @@ Transform:
m_GameObject: {fileID: 4918767296480784053}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2, y: 0.7, z: 0}
- m_LocalScale: {x: 0.3, y: 0.3, z: 1}
+ m_LocalScale: {x: 0.8, y: 0.8, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -74,7 +74,7 @@ SpriteRenderer:
m_SortingLayerID: 702145399
m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 075ebd241af8d477292139248e9ed490, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f25a07768ae205a40bb93b04cdb79ccf, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -119,9 +119,9 @@ CircleCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0.1, y: -0.15}
+ m_Offset: {x: 0, y: 0}
serializedVersion: 2
- m_Radius: 0.4
+ m_Radius: 0.2
--- !u!114 &4918767296480784052
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Maquette/Assets/HealthBar.prefab b/Maquette/Assets/prefabs/HealthBar.prefab
similarity index 100%
rename from Maquette/Assets/HealthBar.prefab
rename to Maquette/Assets/prefabs/HealthBar.prefab
diff --git a/Maquette/Assets/HealthBar.prefab.meta b/Maquette/Assets/prefabs/HealthBar.prefab.meta
similarity index 100%
rename from Maquette/Assets/HealthBar.prefab.meta
rename to Maquette/Assets/prefabs/HealthBar.prefab.meta
diff --git a/Maquette/Assets/Sprites/Aseprite/Kamikaze.prefab b/Maquette/Assets/prefabs/Kamikaze.prefab
similarity index 98%
rename from Maquette/Assets/Sprites/Aseprite/Kamikaze.prefab
rename to Maquette/Assets/prefabs/Kamikaze.prefab
index 98229632365b141087b773b477c7740626afb52a..d223a00c7010aab1f790f840c948f52f56cac5cc 100644
--- a/Maquette/Assets/Sprites/Aseprite/Kamikaze.prefab
+++ b/Maquette/Assets/prefabs/Kamikaze.prefab
@@ -31,7 +31,7 @@ Transform:
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_LocalPosition: {x: 2.576157, y: -0.46150538, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -73,8 +73,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: -427479191
+ m_SortingLayer: 4
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 510859e199ecbd44c9c8dcf8473433dd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Maquette/Assets/Sprites/Aseprite/Kamikaze.prefab.meta b/Maquette/Assets/prefabs/Kamikaze.prefab.meta
similarity index 100%
rename from Maquette/Assets/Sprites/Aseprite/Kamikaze.prefab.meta
rename to Maquette/Assets/prefabs/Kamikaze.prefab.meta
diff --git a/Maquette/Assets/LifeBonus.prefab b/Maquette/Assets/prefabs/LifeBonus.prefab
similarity index 74%
rename from Maquette/Assets/LifeBonus.prefab
rename to Maquette/Assets/prefabs/LifeBonus.prefab
index 46a0562cfaf6e1bb13e403d4203b731ad3cd2ef0..a8ecf1bbff9c6ddce292f5ee6f464c553708038d 100644
--- a/Maquette/Assets/LifeBonus.prefab
+++ b/Maquette/Assets/prefabs/LifeBonus.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &216797475059410422
+--- !u!1 &6042058006873062822
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 216797475059410419}
- - component: {fileID: 216797475059410420}
- - component: {fileID: 216797475059410421}
- - component: {fileID: 216797475059410418}
+ - component: {fileID: 6042058006873062874}
+ - component: {fileID: 6042058006873062875}
+ - component: {fileID: 6042058006873062820}
+ - component: {fileID: 6042058006873062821}
m_Layer: 0
m_Name: LifeBonus
m_TagString: Untagged
@@ -19,53 +19,53 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &216797475059410419
+--- !u!4 &6042058006873062874
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 216797475059410422}
+ m_GameObject: {fileID: 6042058006873062822}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 3.212, y: -2.143, z: -0.5319338}
- m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_LocalPosition: {x: -3.03, y: 0.08, z: 0}
+ 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!61 &216797475059410420
+--- !u!61 &6042058006873062875
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 216797475059410422}
+ m_GameObject: {fileID: 6042058006873062822}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: -0.026881218, y: -0.080587864}
+ 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: 8, y: 8.11}
- newSize: {x: 8, y: 8.11}
+ oldSize: {x: 0.7, y: 0.7}
+ newSize: {x: 0.7, y: 0.7}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 11, y: 11}
+ m_Size: {x: 1.5, y: 1.5}
m_EdgeRadius: 0
---- !u!212 &216797475059410421
+--- !u!212 &6042058006873062820
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 216797475059410422}
+ m_GameObject: {fileID: 6042058006873062822}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -95,31 +95,31 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: 702145399
+ m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9b062f3e398014758aa234aa04a141f1, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 0167683f6aa16224e9670701ffcadbd1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
- m_Size: {x: 8, y: 8.11}
+ m_Size: {x: 0.7, y: 0.7}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!114 &216797475059410418
+--- !u!114 &6042058006873062821
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 216797475059410422}
+ m_GameObject: {fileID: 6042058006873062822}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 24b4434f94508ab41ba1d16a69e1b4ac, type: 3}
m_Name:
m_EditorClassIdentifier:
value: 0
- bonus: 50
+ bonus: 0
diff --git a/Maquette/Assets/LifeBonus.prefab.meta b/Maquette/Assets/prefabs/LifeBonus.prefab.meta
similarity index 100%
rename from Maquette/Assets/LifeBonus.prefab.meta
rename to Maquette/Assets/prefabs/LifeBonus.prefab.meta
diff --git a/Maquette/Assets/prefabs/LifeUp.prefab b/Maquette/Assets/prefabs/LifeUp.prefab
index e15d8c4ea304d440fda6865c2ca07c506e125d23..736b7233f2c452a74e4dce2a9cafac19398ab429 100644
--- a/Maquette/Assets/prefabs/LifeUp.prefab
+++ b/Maquette/Assets/prefabs/LifeUp.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &7843486809914716762
+--- !u!1 &1564419176581148229
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,10 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 7843486809914716767}
- - component: {fileID: 7843486809914716761}
- - component: {fileID: 1095194402}
- - component: {fileID: 1095194405}
+ - component: {fileID: 3456671081044510420}
+ - component: {fileID: 720193521723616461}
+ - component: {fileID: 6650693972555435797}
+ - component: {fileID: 3246853047336580223}
m_Layer: 0
m_Name: LifeUp
m_TagString: LifeUp
@@ -19,32 +19,39 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &7843486809914716767
+--- !u!4 &3456671081044510420
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7843486809914716762}
+ m_GameObject: {fileID: 1564419176581148229}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-<<<<<<< HEAD
- m_LocalPosition: {x: -2.43, y: -1.53, z: -4}
+ m_LocalPosition: {x: 0.25830275, y: 0.53514874, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
-=======
- m_LocalPosition: {x: -2.43, y: -1.53, z: 0}
- m_LocalScale: {x: 0.08983518, y: 0.09247981, z: 1}
->>>>>>> 1c3d68508ebe911058b8aec6fc15e7f8735e5c77
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7843486809914716761
+--- !u!114 &720193521723616461
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1564419176581148229}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 9f44cd34649a24ab9a6d5cd8297ce821, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!212 &6650693972555435797
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7843486809914716762}
+ m_GameObject: {fileID: 1564419176581148229}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@@ -74,74 +81,43 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 702145399
-<<<<<<< HEAD
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: c3d9de03b8ff866419494d17dacf10fc, type: 3}
-=======
- m_SortingLayer: 2
+ m_SortingLayerID: -427479191
+ m_SortingLayer: 4
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9b062f3e398014758aa234aa04a141f1, type: 3}
->>>>>>> 1c3d68508ebe911058b8aec6fc15e7f8735e5c77
+ m_Sprite: {fileID: 21300000, guid: a923cfd9db74a3d4081908bdd8d16d57, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
-<<<<<<< HEAD
- m_Size: {x: 0.64, y: 0.64}
-=======
m_Size: {x: 8, y: 8.11}
->>>>>>> 1c3d68508ebe911058b8aec6fc15e7f8735e5c77
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!61 &1095194402
+--- !u!61 &3246853047336580223
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7843486809914716762}
+ m_GameObject: {fileID: 1564419176581148229}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0.11314416, y: -0.000015199184}
+ m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
-<<<<<<< HEAD
- oldSize: {x: 0.64, y: 0.64}
- newSize: {x: 0.64, y: 0.64}
-=======
- oldSize: {x: 8, y: 8.11}
+ oldSize: {x: 0.9, y: 0.8}
newSize: {x: 8, y: 8.11}
->>>>>>> 1c3d68508ebe911058b8aec6fc15e7f8735e5c77
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
-<<<<<<< HEAD
- m_Size: {x: 0.7, y: 0.6}
-=======
- m_Size: {x: 4.152915, y: 3.2738028}
->>>>>>> 1c3d68508ebe911058b8aec6fc15e7f8735e5c77
+ m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
---- !u!114 &1095194405
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7843486809914716762}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9f44cd34649a24ab9a6d5cd8297ce821, type: 3}
- m_Name:
- m_EditorClassIdentifier:
diff --git a/Maquette/Assets/prefabs/LifeUp.prefab.meta b/Maquette/Assets/prefabs/LifeUp.prefab.meta
index 24c785128dfccbf9468792f36baed4e964640e48..4139c6ad0afbc667f40e38a25f02f3f1e3d9b4c4 100644
--- a/Maquette/Assets/prefabs/LifeUp.prefab.meta
+++ b/Maquette/Assets/prefabs/LifeUp.prefab.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 3760b8c2255ad43d9ac19b4eb747be6f
+guid: fc35b6f9278194b03b569c66ac46dcdc
PrefabImporter:
externalObjects: {}
userData:
diff --git a/Maquette/Assets/Missile.prefab b/Maquette/Assets/prefabs/Missile.prefab
similarity index 95%
rename from Maquette/Assets/Missile.prefab
rename to Maquette/Assets/prefabs/Missile.prefab
index 3221c87c930bbfca6d3db921db3b5262486124f1..fb66a34c4a9dfe2798c14fd258da5fd5f7a30ae4 100644
--- a/Maquette/Assets/Missile.prefab
+++ b/Maquette/Assets/prefabs/Missile.prefab
@@ -30,7 +30,7 @@ Transform:
m_GameObject: {fileID: 880198374213010263}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.9794858, y: -3.8618186, z: -3.7331045}
- m_LocalScale: {x: 0.15, y: 0.15, z: 1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -84,18 +84,18 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 1.7080119, y: 0.04140663}
+ m_Offset: {x: 0.15, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 9, y: 4.58}
+ oldSize: {x: 1.3, y: 0.6}
newSize: {x: 9, y: 4.58}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 4.581657, y: 2.7390718}
+ m_Size: {x: 1, y: 0.6}
m_EdgeRadius: 0
--- !u!212 &880198374213010262
SpriteRenderer:
@@ -136,7 +136,7 @@ SpriteRenderer:
m_SortingLayerID: 507560563
m_SortingLayer: 5
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 3ba4e7ec436c04fa98d9ea52ed033526, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 09f9eaabe3ae53f43a5c66515380e726, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
diff --git a/Maquette/Assets/Missile.prefab.meta b/Maquette/Assets/prefabs/Missile.prefab.meta
similarity index 100%
rename from Maquette/Assets/Missile.prefab.meta
rename to Maquette/Assets/prefabs/Missile.prefab.meta
diff --git a/Maquette/Assets/NoBullet.prefab b/Maquette/Assets/prefabs/NoBullet.prefab
similarity index 100%
rename from Maquette/Assets/NoBullet.prefab
rename to Maquette/Assets/prefabs/NoBullet.prefab
diff --git a/Maquette/Assets/NoBullet.prefab.meta b/Maquette/Assets/prefabs/NoBullet.prefab.meta
similarity index 100%
rename from Maquette/Assets/NoBullet.prefab.meta
rename to Maquette/Assets/prefabs/NoBullet.prefab.meta
diff --git a/Maquette/Assets/Palette1.prefab b/Maquette/Assets/prefabs/Palette1.prefab
similarity index 100%
rename from Maquette/Assets/Palette1.prefab
rename to Maquette/Assets/prefabs/Palette1.prefab
diff --git a/Maquette/Assets/Palette1.prefab.meta b/Maquette/Assets/prefabs/Palette1.prefab.meta
similarity index 100%
rename from Maquette/Assets/Palette1.prefab.meta
rename to Maquette/Assets/prefabs/Palette1.prefab.meta
diff --git a/Maquette/Assets/Plomb.prefab b/Maquette/Assets/prefabs/Plomb.prefab
similarity index 87%
rename from Maquette/Assets/Plomb.prefab
rename to Maquette/Assets/prefabs/Plomb.prefab
index 9c937c6cbc3e398cd65c1091f0902cc434a6c60c..7dc07fddbd0144556b932f7e3a410429389b4473 100644
--- a/Maquette/Assets/Plomb.prefab
+++ b/Maquette/Assets/prefabs/Plomb.prefab
@@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 7554084641589260100}
- component: {fileID: 8654857513379560098}
- component: {fileID: 3985017744125892617}
+ - component: {fileID: 7558590989095397683}
m_Layer: 8
m_Name: Plomb
m_TagString: DamageMaker
@@ -30,7 +31,7 @@ Transform:
m_GameObject: {fileID: 7554084641589260103}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.41, y: -0.59, z: 0}
- m_LocalScale: {x: 0.11153289, y: 0.111532845, z: 1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -71,7 +72,7 @@ CircleCollider2D:
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
- m_Radius: 0.5
+ m_Radius: 0.1
--- !u!212 &7554084641589260100
SpriteRenderer:
m_ObjectHideFlags: 0
@@ -111,7 +112,7 @@ SpriteRenderer:
m_SortingLayerID: 702145399
m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: d5005d7f7b92a446c85fa80291358892, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f11b1717c26eb8a4b8b8f305ee4756a0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -149,3 +150,16 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
damage: 5
+--- !u!114 &7558590989095397683
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7554084641589260103}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0ce8e766cca3c0d4688272f10702dbdc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ duration: 0.2
diff --git a/Maquette/Assets/Plomb.prefab.meta b/Maquette/Assets/prefabs/Plomb.prefab.meta
similarity index 100%
rename from Maquette/Assets/Plomb.prefab.meta
rename to Maquette/Assets/prefabs/Plomb.prefab.meta
diff --git a/Maquette/Assets/Portal.prefab b/Maquette/Assets/prefabs/Portal.prefab
similarity index 88%
rename from Maquette/Assets/Portal.prefab
rename to Maquette/Assets/prefabs/Portal.prefab
index 742cc1401b3ae2fe3c943ccdef88a621d30a2b4b..121bd0ae677c92703efc4cb7dbdbd40e98c034fa 100644
--- a/Maquette/Assets/Portal.prefab
+++ b/Maquette/Assets/prefabs/Portal.prefab
@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 9060317251694670717}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.2, y: -0.5, z: 0}
- m_LocalScale: {x: 0.6008233, y: 0.6001431, z: 1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -46,18 +46,18 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0, y: 0}
+ m_Offset: {x: 1, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 1.72, y: 1.76}
+ oldSize: {x: 3.9, y: 1.9}
newSize: {x: 1.72, y: 1.76}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 1.7, y: 1.7}
+ m_Size: {x: 2.1, y: 2.1}
m_EdgeRadius: 0
--- !u!212 &9060317251694670718
SpriteRenderer:
@@ -98,7 +98,7 @@ SpriteRenderer:
m_SortingLayerID: 702145399
m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: e8d6ef10ccacb4fb1aaab057cba6846c, type: 3}
+ m_Sprite: {fileID: 570604127520474917, guid: 20087621c7d88b740a4eedc76cf6e9b1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -108,7 +108,7 @@ SpriteRenderer:
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
- m_SpriteSortPoint: 0
+ m_SpriteSortPoint: 1
--- !u!114 &9060317251694670713
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -123,8 +123,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
bobbydead: 0
clydedead: 0
- closedsprite: {fileID: 21300000, guid: e8d6ef10ccacb4fb1aaab057cba6846c, type: 3}
- opensprite: {fileID: 21300000, guid: a651ccad5a2e146d7a0f049fda73b9c8, type: 3}
+ closedsprite: {fileID: 570604127520474917, guid: 20087621c7d88b740a4eedc76cf6e9b1,
+ type: 3}
+ opensprite: {fileID: 7560749161186844325, guid: 20087621c7d88b740a4eedc76cf6e9b1,
+ type: 3}
image: {fileID: 9060317251694670718}
next: 1
Bobby: {fileID: 0}
diff --git a/Maquette/Assets/Portal.prefab.meta b/Maquette/Assets/prefabs/Portal.prefab.meta
similarity index 100%
rename from Maquette/Assets/Portal.prefab.meta
rename to Maquette/Assets/prefabs/Portal.prefab.meta
diff --git a/Maquette/Assets/RateBonus.prefab b/Maquette/Assets/prefabs/RateBonus.prefab
similarity index 93%
rename from Maquette/Assets/RateBonus.prefab
rename to Maquette/Assets/prefabs/RateBonus.prefab
index 36fbeced64e5901e91d9c069d666f77fc7b688a0..225c2050ce1ed149e4b34e63794d1cb82a87ea7a 100644
--- a/Maquette/Assets/RateBonus.prefab
+++ b/Maquette/Assets/prefabs/RateBonus.prefab
@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 5758036818848323921}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.14, y: -2.19, z: -9.067989}
- m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_LocalScale: {x: 1, y: 1, z: 0.1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -69,10 +69,10 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: 702145399
+ m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9b062f3e398014758aa234aa04a141f1, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 11edea8d38c917c45baf939f6d85a6f4, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -100,14 +100,14 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 8, y: 8.11}
+ oldSize: {x: 1, y: 1.1}
newSize: {x: 8, y: 8.11}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 11, y: 11}
+ m_Size: {x: 1.5, y: 1.5}
m_EdgeRadius: 0
--- !u!114 &5758036818848323920
MonoBehaviour:
diff --git a/Maquette/Assets/RateBonus.prefab.meta b/Maquette/Assets/prefabs/RateBonus.prefab.meta
similarity index 100%
rename from Maquette/Assets/RateBonus.prefab.meta
rename to Maquette/Assets/prefabs/RateBonus.prefab.meta
diff --git a/Maquette/Assets/Robot.prefab b/Maquette/Assets/prefabs/Robot.prefab
similarity index 100%
rename from Maquette/Assets/Robot.prefab
rename to Maquette/Assets/prefabs/Robot.prefab
diff --git a/Maquette/Assets/Robot.prefab.meta b/Maquette/Assets/prefabs/Robot.prefab.meta
similarity index 100%
rename from Maquette/Assets/Robot.prefab.meta
rename to Maquette/Assets/prefabs/Robot.prefab.meta
diff --git a/Maquette/Assets/Rubble.prefab b/Maquette/Assets/prefabs/Rubble.prefab
similarity index 100%
rename from Maquette/Assets/Rubble.prefab
rename to Maquette/Assets/prefabs/Rubble.prefab
diff --git a/Maquette/Assets/Rubble.prefab.meta b/Maquette/Assets/prefabs/Rubble.prefab.meta
similarity index 100%
rename from Maquette/Assets/Rubble.prefab.meta
rename to Maquette/Assets/prefabs/Rubble.prefab.meta
diff --git a/Maquette/Assets/Sprites/Aseprite/Spawner.prefab b/Maquette/Assets/prefabs/Spawner.prefab
similarity index 97%
rename from Maquette/Assets/Sprites/Aseprite/Spawner.prefab
rename to Maquette/Assets/prefabs/Spawner.prefab
index 55e7c44d34e4d0311bef7170d4499c9844fa79f3..3fee930cfca2ae3e51d4f571f2f2ff33b2b6e9b9 100644
--- a/Maquette/Assets/Sprites/Aseprite/Spawner.prefab
+++ b/Maquette/Assets/prefabs/Spawner.prefab
@@ -28,7 +28,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7612275727987264507}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 5.77, y: -3.01, z: -2}
+ m_LocalPosition: {x: 5.77, y: -3.01, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -70,8 +70,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: -427479191
+ m_SortingLayer: 4
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: faf5112cd55973140bb6820db7e10a09, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -140,3 +140,4 @@ MonoBehaviour:
offset: {x: 0, y: 0.5, z: 0}
kamikaze: {fileID: 1847200226376073621, guid: 260cded7245744342bd2b83e5c3db0af,
type: 3}
+ isdead: 0
diff --git a/Maquette/Assets/Sprites/Aseprite/Spawner.prefab.meta b/Maquette/Assets/prefabs/Spawner.prefab.meta
similarity index 100%
rename from Maquette/Assets/Sprites/Aseprite/Spawner.prefab.meta
rename to Maquette/Assets/prefabs/Spawner.prefab.meta
diff --git a/Maquette/Assets/SpeedBonus.prefab b/Maquette/Assets/prefabs/SpeedBonus.prefab
similarity index 93%
rename from Maquette/Assets/SpeedBonus.prefab
rename to Maquette/Assets/prefabs/SpeedBonus.prefab
index 70c04b3b51fa375b00aa7300e1e385b09b6acb7c..082667cc30f4e96c2538f868a1f0ddb8f14defd8 100644
--- a/Maquette/Assets/SpeedBonus.prefab
+++ b/Maquette/Assets/prefabs/SpeedBonus.prefab
@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 5308852454019452876}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.39, y: -1.118, z: -6.389725}
- m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+ m_LocalScale: {x: 1, y: 1, z: 0.1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@@ -69,10 +69,10 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
+ m_SortingLayerID: 702145399
+ m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 9b062f3e398014758aa234aa04a141f1, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 393c9ed6352a2b34e8eff1a65ba358af, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -100,14 +100,14 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 8, y: 8.11}
+ oldSize: {x: 1.1, y: 0.8}
newSize: {x: 8, y: 8.11}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 11, y: 11}
+ m_Size: {x: 1.5, y: 1.5}
m_EdgeRadius: 0
--- !u!114 &5308852454019452877
MonoBehaviour:
diff --git a/Maquette/Assets/SpeedBonus.prefab.meta b/Maquette/Assets/prefabs/SpeedBonus.prefab.meta
similarity index 100%
rename from Maquette/Assets/SpeedBonus.prefab.meta
rename to Maquette/Assets/prefabs/SpeedBonus.prefab.meta
diff --git a/Maquette/Assets/Table.prefab b/Maquette/Assets/prefabs/Table.prefab
similarity index 100%
rename from Maquette/Assets/Table.prefab
rename to Maquette/Assets/prefabs/Table.prefab
diff --git a/Maquette/Assets/Table.prefab.meta b/Maquette/Assets/prefabs/Table.prefab.meta
similarity index 100%
rename from Maquette/Assets/Table.prefab.meta
rename to Maquette/Assets/prefabs/Table.prefab.meta
diff --git a/Maquette/Assets/Tank.prefab b/Maquette/Assets/prefabs/Tank.prefab
similarity index 98%
rename from Maquette/Assets/Tank.prefab
rename to Maquette/Assets/prefabs/Tank.prefab
index 6665861344fb0def01c2cd8fb3cd5c112bb11958..dabf46894f2b06c6c6f239c641d3fbb2f9fbd2b0 100644
--- a/Maquette/Assets/Tank.prefab
+++ b/Maquette/Assets/prefabs/Tank.prefab
@@ -322,7 +322,7 @@ Transform:
m_GameObject: {fileID: 4671451443811086358}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.20601529, y: -0.20210017, z: 0}
- m_LocalScale: {x: 3, y: 3, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 0}
m_Children:
- {fileID: 4671451441955014073}
- {fileID: 4671451442330189709}
@@ -393,8 +393,7 @@ SpriteRenderer:
m_SortingLayerID: 507560563
m_SortingLayer: 5
m_SortingOrder: 0
- m_Sprite: {fileID: -8517799911898572495, guid: dc4f0ee44047c4525b06e833fc6b4e35,
- type: 3}
+ m_Sprite: {fileID: 21300000, guid: 350d1a30185d6564a87eae6c9cc08cb7, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -427,6 +426,7 @@ MonoBehaviour:
Players: []
speed: 0.25
rotatespeed: 7
+ angle: 0
--- !u!114 &4671451443811086345
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -452,6 +452,7 @@ MonoBehaviour:
roomCanvas: {fileID: 0}
offset: {x: 0, y: 1.5, z: 0}
kamikaze: {fileID: 0}
+ isdead: 0
--- !u!61 &1385136654
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -469,14 +470,14 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 0.67, y: 0.63}
+ oldSize: {x: 3.1, y: 2.6}
newSize: {x: 0.63, y: 0.67}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 0.61, y: 0.56337106}
+ m_Size: {x: 2.8, y: 2.8}
m_EdgeRadius: 0
--- !u!1 &4671451443837868049
GameObject:
diff --git a/Maquette/Assets/Tank.prefab.meta b/Maquette/Assets/prefabs/Tank.prefab.meta
similarity index 100%
rename from Maquette/Assets/Tank.prefab.meta
rename to Maquette/Assets/prefabs/Tank.prefab.meta
diff --git a/Maquette/Assets/Tower.prefab b/Maquette/Assets/prefabs/Tower.prefab
similarity index 95%
rename from Maquette/Assets/Tower.prefab
rename to Maquette/Assets/prefabs/Tower.prefab
index 88af94ad9427d2cdd0e3c743be6c7a3054d26600..c4dca22142ce2e4f45191c8d971a720a041f4485 100644
--- a/Maquette/Assets/Tower.prefab
+++ b/Maquette/Assets/prefabs/Tower.prefab
@@ -46,6 +46,7 @@ MonoBehaviour:
FirePointTower: {fileID: 4254414072483399188}
Bullet: {fileID: 7163642854384020411, guid: b0c33b05543f0496396a571f77cad5eb, type: 3}
Tower: {fileID: 4254414072541147999}
+ angle: 0
--- !u!1 &4254414072483399187
GameObject:
m_ObjectHideFlags: 0
@@ -70,7 +71,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4254414072483399187}
m_LocalRotation: {x: -0, y: -0, z: 1, w: 0}
- m_LocalPosition: {x: -3.38, y: 0.066666596, z: -0.14103937}
+ m_LocalPosition: {x: -1, y: 0, z: -0.14103937}
m_LocalScale: {x: 3.333333, y: 3.333333, z: 1}
m_Children: []
m_Father: {fileID: 4254414072138560575}
@@ -104,8 +105,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4254414072541147996}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 2.9, y: 1.33, z: 0}
- m_LocalScale: {x: 0.3, y: 0.3, z: 1}
+ m_LocalPosition: {x: 3.72, y: 1.62, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4254414072483399188}
- {fileID: 4254414072316778641}
@@ -151,7 +152,7 @@ SpriteRenderer:
m_SortingLayerID: 507560563
m_SortingLayer: 5
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: b4e890c3a04474d0cad425d2eadf6818, type: 3}
+ m_Sprite: {fileID: 21300000, guid: c8c4ba78817712b4d80f82b4b6b59fcc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -174,7 +175,7 @@ Rigidbody2D:
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 1
- m_Mass: 1.368478
+ m_Mass: 1.1309735
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
@@ -196,9 +197,9 @@ CircleCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: 0.4, y: 0}
+ m_Offset: {x: 0.2, y: 0}
serializedVersion: 2
- m_Radius: 2.2
+ m_Radius: 0.6
--- !u!114 &5383045649545973815
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -223,3 +224,5 @@ MonoBehaviour:
cash: {fileID: 5902828749815425179, guid: f6d75766048fc427b976d42e8919bf84, type: 3}
roomCanvas: {fileID: 0}
offset: {x: 0, y: 1, z: 0}
+ kamikaze: {fileID: 0}
+ isdead: 0
diff --git a/Maquette/Assets/Tower.prefab.meta b/Maquette/Assets/prefabs/Tower.prefab.meta
similarity index 100%
rename from Maquette/Assets/Tower.prefab.meta
rename to Maquette/Assets/prefabs/Tower.prefab.meta
diff --git a/Maquette/Assets/Villain.prefab b/Maquette/Assets/prefabs/Villain.prefab
similarity index 96%
rename from Maquette/Assets/Villain.prefab
rename to Maquette/Assets/prefabs/Villain.prefab
index 28df231e01f0714634061302fedf4be1f368c2dc..9dbb504e6c034feaa4b2435d2da0065155417467 100644
--- a/Maquette/Assets/Villain.prefab
+++ b/Maquette/Assets/prefabs/Villain.prefab
@@ -30,7 +30,7 @@ Transform:
m_GameObject: {fileID: 1999743495383100374}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.96, y: 0.77, z: 0}
- m_LocalScale: {x: 1.5, y: 1.5, z: 1}
+ m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6923119578298239390}
- {fileID: 6923119580283927732}
@@ -76,7 +76,8 @@ SpriteRenderer:
m_SortingLayerID: 507560563
m_SortingLayer: 5
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 6603d7747027040fbbfcba0d1e4c7ca4, type: 3}
+ m_Sprite: {fileID: -953368578020683905, guid: ff4a2750a361c7d4592c5be2222b8439,
+ type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -121,18 +122,18 @@ BoxCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
- m_Offset: {x: -0.14216584, y: 0.05208443}
+ m_Offset: {x: -0.14216584, y: -0.02}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 0.96, y: 0.62}
+ oldSize: {x: 1.5, y: 0.8}
newSize: {x: 0.96, y: 0.62}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
- m_Size: {x: 0.41621733, y: 0.23804241}
+ m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &6923119579645949281
MonoBehaviour:
@@ -158,6 +159,8 @@ MonoBehaviour:
cash: {fileID: 5902828749815425179, guid: f6d75766048fc427b976d42e8919bf84, type: 3}
roomCanvas: {fileID: 0}
offset: {x: 0, y: 0.5, z: 0}
+ kamikaze: {fileID: 0}
+ isdead: 0
--- !u!114 &6923119579645949282
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -227,6 +230,8 @@ MonoBehaviour:
cadence: 0
projectile: {fileID: 0}
isBurning: 0
+ firecadence: 0
+ Ratetext: {fileID: 0}
--- !u!1 &6923119578298239389
GameObject:
m_ObjectHideFlags: 0
@@ -251,7 +256,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6923119578298239389}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0.32666668, y: 0.026666641, z: -2}
+ m_LocalPosition: {x: 0.9, y: -0.1, z: 0}
m_LocalScale: {x: 0.6666667, y: 0.6666667, z: 1}
m_Children: []
m_Father: {fileID: 1999743495383100369}
@@ -308,3 +313,4 @@ MonoBehaviour:
weapons: {fileID: 11400000, guid: 1919b5b27e7b84012a3f4bba54b04b0f, type: 2}
roomCanvas: {fileID: 0}
range: 2
+ minrange: 0
diff --git a/Maquette/Assets/Villain.prefab.meta b/Maquette/Assets/prefabs/Villain.prefab.meta
similarity index 100%
rename from Maquette/Assets/Villain.prefab.meta
rename to Maquette/Assets/prefabs/Villain.prefab.meta
diff --git a/Maquette/Assets/WeaponLoot.prefab b/Maquette/Assets/prefabs/WeaponLoot.prefab
similarity index 99%
rename from Maquette/Assets/WeaponLoot.prefab
rename to Maquette/Assets/prefabs/WeaponLoot.prefab
index fabf4c73cf53febc30b71b02bf88ffafbb673ddc..ef9bbb17b2549fc91b14dec59e3335721b1d0a04 100644
--- a/Maquette/Assets/WeaponLoot.prefab
+++ b/Maquette/Assets/prefabs/WeaponLoot.prefab
@@ -116,7 +116,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2.7, y: -86.6}
- m_SizeDelta: {x: 100, y: 100}
+ m_SizeDelta: {x: 80, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3075358178863567199
CanvasRenderer:
diff --git a/Maquette/Assets/WeaponLoot.prefab.meta b/Maquette/Assets/prefabs/WeaponLoot.prefab.meta
similarity index 100%
rename from Maquette/Assets/WeaponLoot.prefab.meta
rename to Maquette/Assets/prefabs/WeaponLoot.prefab.meta
diff --git a/Maquette/Assets/assaultRifleLoot.prefab b/Maquette/Assets/prefabs/assaultRifleLoot.prefab
similarity index 100%
rename from Maquette/Assets/assaultRifleLoot.prefab
rename to Maquette/Assets/prefabs/assaultRifleLoot.prefab
diff --git a/Maquette/Assets/assaultRifleLoot.prefab.meta b/Maquette/Assets/prefabs/assaultRifleLoot.prefab.meta
similarity index 100%
rename from Maquette/Assets/assaultRifleLoot.prefab.meta
rename to Maquette/Assets/prefabs/assaultRifleLoot.prefab.meta
diff --git a/Maquette/Assets/grenadeLauncherLoot.prefab b/Maquette/Assets/prefabs/grenadeLauncherLoot.prefab
similarity index 100%
rename from Maquette/Assets/grenadeLauncherLoot.prefab
rename to Maquette/Assets/prefabs/grenadeLauncherLoot.prefab
diff --git a/Maquette/Assets/grenadeLauncherLoot.prefab.meta b/Maquette/Assets/prefabs/grenadeLauncherLoot.prefab.meta
similarity index 100%
rename from Maquette/Assets/grenadeLauncherLoot.prefab.meta
rename to Maquette/Assets/prefabs/grenadeLauncherLoot.prefab.meta
diff --git a/Maquette/Assets/handgunLoot.prefab b/Maquette/Assets/prefabs/handgunLoot.prefab
similarity index 100%
rename from Maquette/Assets/handgunLoot.prefab
rename to Maquette/Assets/prefabs/handgunLoot.prefab
diff --git a/Maquette/Assets/handgunLoot.prefab.meta b/Maquette/Assets/prefabs/handgunLoot.prefab.meta
similarity index 100%
rename from Maquette/Assets/handgunLoot.prefab.meta
rename to Maquette/Assets/prefabs/handgunLoot.prefab.meta
diff --git a/Maquette/Assets/shotgunLoot.prefab b/Maquette/Assets/prefabs/shotgunLoot.prefab
similarity index 100%
rename from Maquette/Assets/shotgunLoot.prefab
rename to Maquette/Assets/prefabs/shotgunLoot.prefab
diff --git a/Maquette/Assets/shotgunLoot.prefab.meta b/Maquette/Assets/prefabs/shotgunLoot.prefab.meta
similarity index 100%
rename from Maquette/Assets/shotgunLoot.prefab.meta
rename to Maquette/Assets/prefabs/shotgunLoot.prefab.meta
diff --git a/Maquette/Assets/uziLoot.prefab b/Maquette/Assets/prefabs/uziLoot.prefab
similarity index 95%
rename from Maquette/Assets/uziLoot.prefab
rename to Maquette/Assets/prefabs/uziLoot.prefab
index 5aa488cfccce86166d9ace7f96499aeb4e3d3739..420a31ba514f1bcb73944ff8d0170c6d4cb75511 100644
--- a/Maquette/Assets/uziLoot.prefab
+++ b/Maquette/Assets/prefabs/uziLoot.prefab
@@ -70,9 +70,9 @@ SpriteRenderer:
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 702145399
- m_SortingLayer: 2
+ m_SortingLayer: 3
m_SortingOrder: 0
- m_Sprite: {fileID: 21300000, guid: 1c620adab7f934de6aa136383689d16a, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 63904c148aa8ad7408af4d157ca07f24, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
@@ -96,6 +96,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
gunName: 3
+ value: 0
+ weapons: {fileID: 0}
--- !u!61 &3436849231233756019
BoxCollider2D:
m_ObjectHideFlags: 0
@@ -113,7 +115,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
- oldSize: {x: 5.12, y: 5.12}
+ oldSize: {x: 1.2, y: 0.3}
newSize: {x: 5.12, y: 5.12}
adaptiveTilingThreshold: 0.5
drawMode: 0
diff --git a/Maquette/Assets/uziLoot.prefab.meta b/Maquette/Assets/prefabs/uziLoot.prefab.meta
similarity index 100%
rename from Maquette/Assets/uziLoot.prefab.meta
rename to Maquette/Assets/prefabs/uziLoot.prefab.meta
diff --git a/Maquette/Assets/sprite.cs b/Maquette/Assets/sprite.cs
new file mode 100644
index 0000000000000000000000000000000000000000..650d87b9657cae385aa9dc2cc13f7decef1205b8
--- /dev/null
+++ b/Maquette/Assets/sprite.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class sprite : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Maquette/Assets/sprite.cs.meta b/Maquette/Assets/sprite.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4c73c505718168685487a64c48393173e4e07d29
--- /dev/null
+++ b/Maquette/Assets/sprite.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 435921fb9cd762742a3a3471ef82d2fa
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Maquette/Assets/weaponData.asset b/Maquette/Assets/weaponData.asset
index 1626ad3bec8338b7bc319f53c7bf3ee26b8a2d9e..bd5ee02ddec8911c416aebda38d241d6ae9fe1a4 100644
--- a/Maquette/Assets/weaponData.asset
+++ b/Maquette/Assets/weaponData.asset
@@ -15,7 +15,7 @@ MonoBehaviour:
shotgun:
name: 0
cadence: 40
- sprite: {fileID: 21300000, guid: 01066ed4223144e87b1ab33e3bfc04b7, type: 3}
+ sprite: {fileID: 21300000, guid: 4a95412eeb157e346ad838e008237b7c, type: 3}
projectile: {fileID: 7554084641589260103, guid: ce8899ee88d3745ec9820ada2ff2042b,
type: 3}
assaultRifle:
@@ -33,25 +33,25 @@ MonoBehaviour:
uzi:
name: 3
cadence: 8
- sprite: {fileID: 21300000, guid: 1c620adab7f934de6aa136383689d16a, type: 3}
+ sprite: {fileID: 21300000, guid: 63904c148aa8ad7408af4d157ca07f24, type: 3}
projectile: {fileID: 7163642854384020411, guid: b0c33b05543f0496396a571f77cad5eb,
type: 3}
grenadeLauncher:
name: 4
cadence: 30
- sprite: {fileID: 21300000, guid: 1025246408bc747bf9f601178fa83717, type: 3}
+ sprite: {fileID: 21300000, guid: c373358d4f1e8af48b8e1ac16fd4576b, type: 3}
projectile: {fileID: 4918767296480784053, guid: 3f7d3aaa8b589fd48b0832c1b6cbff0f,
type: 3}
missileLauncher:
name: 5
cadence: 250
- sprite: {fileID: 21300000, guid: 224413d657e83419f88a98e7584c515c, type: 3}
+ sprite: {fileID: 21300000, guid: 92e0ac7d551d74747ae39f1c4a4e47ce, type: 3}
projectile: {fileID: 880198374213010263, guid: 788947ee35b534bdc8c416dd1e139db9,
type: 3}
flameThrower:
name: 6
cadence: 0
- sprite: {fileID: 21300000, guid: 6362a7527face4c0db4a9274768656b0, type: 3}
+ sprite: {fileID: 21300000, guid: c5545e81932177c4eaa66ec270b230c0, type: 3}
projectile: {fileID: 1108585196645417187, guid: 72dc0458c46a349628255bfa98b098c1,
type: 3}
noGun: