diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index b19fc67..9dc9692 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1,5 +1,119 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!54 &3224832258631850785 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + serializedVersion: 2 + m_Mass: 10 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!136 &3224832258631850791 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 1.4958494 + m_Direction: 1 + m_Center: {x: 0, y: 0.69886935, z: 0} +--- !u!114 &3224832258631850784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a3db9d02d190fcb46a9646c275a560e4, type: 3} + m_Name: + m_EditorClassIdentifier: + body: {fileID: 3224832258631850785} + constSpeed: 2 + constRotation: 150 + constUpForce: 5 +--- !u!114 &3224832258631850788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d6c86531c866cd5409820556c3fc2c4e, type: 3} + m_Name: + m_EditorClassIdentifier: + selectedMovement: 4 +--- !u!114 &3224832258631850789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21b58e0dd1248034c871465fc721b43c, type: 3} + m_Name: + m_EditorClassIdentifier: + body: {fileID: 3224832258631850785} +--- !u!114 &3224832258631850792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e5d6c19446783f148a1933e20dd05b52, type: 3} + m_Name: + m_EditorClassIdentifier: + body: {fileID: 3224832258631850785} + constSpeed: 1 + constRotation: 10 + constUpForce: 1 +--- !u!114 &3224832258631850794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 32e5e814edc24cf41999243fa65b4488, type: 3} + m_Name: + m_EditorClassIdentifier: + body: {fileID: 3224832258631850785} +--- !u!114 &3224832258631850795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2306280665800783484} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1c56a27abb4b87b419b7fa61804fd6f8, type: 3} + m_Name: + m_EditorClassIdentifier: + body: {fileID: 3224832258631850785} --- !u!1 &3224832256910634688 GameObject: m_ObjectHideFlags: 0 @@ -411,120 +525,6 @@ MonoBehaviour: m_EditorClassIdentifier: EnableIMU: 1 EnableLocalize: 1 ---- !u!54 &3224832258631850785 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - serializedVersion: 2 - m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!136 &3224832258631850791 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.5 - m_Height: 1.4958494 - m_Direction: 1 - m_Center: {x: 0, y: 0.69886935, z: 0} ---- !u!114 &3224832258631850784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a3db9d02d190fcb46a9646c275a560e4, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 3224832258631850785} - constSpeed: 2 - constRotation: 150 - constUpForce: 5 ---- !u!114 &3224832258631850788 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d6c86531c866cd5409820556c3fc2c4e, type: 3} - m_Name: - m_EditorClassIdentifier: - selectedMovement: 4 ---- !u!114 &3224832258631850789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 21b58e0dd1248034c871465fc721b43c, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 3224832258631850785} ---- !u!114 &3224832258631850794 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 32e5e814edc24cf41999243fa65b4488, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 3224832258631850785} ---- !u!114 &3224832258631850795 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1c56a27abb4b87b419b7fa61804fd6f8, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 3224832258631850785} ---- !u!114 &3224832258631850792 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2306280665800783484} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d6c19446783f148a1933e20dd05b52, type: 3} - m_Name: - m_EditorClassIdentifier: - body: {fileID: 3224832258631850785} - constSpeed: 1 - constRotation: 10 - constUpForce: 1 --- !u!1 &4216049522789318228 GameObject: m_ObjectHideFlags: 0 @@ -559,6 +559,56 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2902280922919532304 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4805096534780782154} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.9720352, y: 0.7918635, z: 0.5843751} + m_Center: {x: 0.0000009685755, y: 1.3513161, z: 5.9292258e-21} +--- !u!114 &1320452240820401174 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4805096534780782154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 371259076e90d4644bd42d907733d382, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!65 &5130785438646090787 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4805096536171856700} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.9720352, y: 0.7671383, z: 0.5843751} + m_Center: {x: 0.0000009685755, y: 1.3636787, z: 5.9292258e-21} +--- !u!114 &8036359248217035720 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4805096536171856700} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 371259076e90d4644bd42d907733d382, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3224832256724492204 PrefabInstance: m_ObjectHideFlags: 0 @@ -731,6 +781,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb7b0d81414d6724fa971f03578cebd2, type: 3} +--- !u!1 &4805096536171856700 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7957796827298215147, guid: eb7b0d81414d6724fa971f03578cebd2, + type: 3} + m_PrefabInstance: {fileID: 3224832256823326679} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3224832257597600064 PrefabInstance: m_ObjectHideFlags: 0 @@ -968,6 +1024,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: eb7b0d81414d6724fa971f03578cebd2, type: 3} +--- !u!1 &4805096534780782154 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7957796827298215147, guid: eb7b0d81414d6724fa971f03578cebd2, + type: 3} + m_PrefabInstance: {fileID: 3224832258276233889} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3224832258464915726 PrefabInstance: m_ObjectHideFlags: 0 @@ -1069,6 +1131,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 3224832258464915726} m_PrefabAsset: {fileID: 0} +--- !u!4 &3224832258464737004 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 477154, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 3224832258464915726} + m_PrefabAsset: {fileID: 0} --- !u!114 &3224832258475577946 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11400020, guid: ce816f2e6abb0504092c23ed9b970dfd, @@ -1081,12 +1149,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df9f338034892c44ebb62d97894772f1, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &3224832258464737004 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 477154, guid: ce816f2e6abb0504092c23ed9b970dfd, - type: 3} - m_PrefabInstance: {fileID: 3224832258464915726} - m_PrefabAsset: {fileID: 0} --- !u!114 &3224832258475577924 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 11400010, guid: ce816f2e6abb0504092c23ed9b970dfd, diff --git a/Assets/Prefabs/Target.prefab b/Assets/Prefabs/Target.prefab new file mode 100644 index 0000000..09d570f --- /dev/null +++ b/Assets/Prefabs/Target.prefab @@ -0,0 +1,233 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &360291015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 360291016} + - component: {fileID: 360291018} + - component: {fileID: 360291017} + m_Layer: 0 + m_Name: text_timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &360291016 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360291015} + 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: 1457568625765347955} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &360291018 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360291015} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10100, guid: 0000000000000000e000000000000000, 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!102 &360291017 +TextMesh: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360291015} + m_Text: + m_OffsetZ: 0 + m_CharacterSize: 1 + m_LineSpacing: 1 + m_Anchor: 0 + m_Alignment: 0 + m_TabSize: 4 + m_FontSize: 0 + m_FontStyle: 0 + m_RichText: 1 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Color: + serializedVersion: 2 + rgba: 4294967295 +--- !u!65 &935425384 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2265735427057985737} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!65 &1582974122 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2411982077121186379} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.01978062, y: 0.014169557, z: 0.016384587} + m_Center: {x: 0, y: -0.00022007506, z: 0.007672023} +--- !u!114 &1582974121 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2411982077121186379} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7db44b838a6a5f244ae1a368e8a33a81, type: 3} + m_Name: + m_EditorClassIdentifier: + timer: {fileID: 0} + NextScene: MainGame + text: {fileID: 360291017} + IsQuickTeleport: 0 + noMovementChange: 1 + nextMouv: 0 +--- !u!1001 &1418892869967680920 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalPosition.x + value: 11.504601 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.100000024 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalPosition.z + value: 7.749016 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_Name + value: Demon + objectReference: {fileID: 0} + - target: {fileID: 5890278844041205852, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: f3a730533b2c9db4ea213f51ceba103d, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} +--- !u!1 &2265735427057985737 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + m_PrefabInstance: {fileID: 1418892869967680920} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1457568625765347955 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + m_PrefabInstance: {fileID: 1418892869967680920} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2411982077121186379 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3659736991398420435, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + m_PrefabInstance: {fileID: 1418892869967680920} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Target.prefab.meta b/Assets/Prefabs/Target.prefab.meta new file mode 100644 index 0000000..4a004ee --- /dev/null +++ b/Assets/Prefabs/Target.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ee9c15aadd536474d81f09a29097e42e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index db9395f..9296e4c 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.2257134, b: 0.30692226, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2544,84 +2544,10 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &559704521 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + m_CorrespondingSourceObject: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, type: 3} - m_PrefabInstance: {fileID: 571032571} + m_PrefabInstance: {fileID: 1418892869464970851} m_PrefabAsset: {fileID: 0} ---- !u!1001 &571032571 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1082707688} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalPosition.x - value: 11.504601 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.100000024 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalPosition.z - value: 7.749016 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_Name - value: Demon - objectReference: {fileID: 0} - - target: {fileID: 5890278844041205852, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: f3a730533b2c9db4ea213f51ceba103d, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} --- !u!1001 &585939210 PrefabInstance: m_ObjectHideFlags: 0 @@ -10150,6 +10076,79 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!1001 &1418892869464970851 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1082707688} + m_Modifications: + - target: {fileID: 1582974121, guid: ee9c15aadd536474d81f09a29097e42e, type: 3} + propertyPath: timer + value: + objectReference: {fileID: 3224832256689880467} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalPosition.x + value: 11.504601 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.100000024 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalPosition.z + value: 7.749016 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1457568625765347955, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2265735427057985737, guid: ee9c15aadd536474d81f09a29097e42e, + type: 3} + propertyPath: m_Name + value: Demon + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ee9c15aadd536474d81f09a29097e42e, type: 3} --- !u!1001 &3224832256689880466 PrefabInstance: m_ObjectHideFlags: 0 @@ -10219,6 +10218,18 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cdbac44d9cb15a04684f19dd29e2f2db, type: 3} +--- !u!114 &3224832256689880467 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3224832257380790173, guid: cdbac44d9cb15a04684f19dd29e2f2db, + type: 3} + m_PrefabInstance: {fileID: 3224832256689880466} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10905daa68280fb409fb8b12d42ec16f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!65 &3880832135617074770 BoxCollider: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/HammerScript.meta b/Assets/Scripts/HammerScript.meta new file mode 100644 index 0000000..cf92bb4 --- /dev/null +++ b/Assets/Scripts/HammerScript.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb357c140c0c7ea4c90422479a5d7cc0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HammerScript/Executable.cs b/Assets/Scripts/HammerScript/Executable.cs new file mode 100644 index 0000000..28232c0 --- /dev/null +++ b/Assets/Scripts/HammerScript/Executable.cs @@ -0,0 +1,57 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using static MovementGen; +using UnityEngine.SceneManagement; + +public class Executable : MonoBehaviour +{ + public Timer timer; + public string NextScene; + public TextMesh text; + public bool IsQuickTeleport = false; + public bool noMovementChange = true; + public ChoiceOfMovement nextMouv; + + void Start() + { + //Set the tag of this GameObject to Player + gameObject.tag = "Target"; + } + + public void Execute() + { + if (timer) + { + timer.Stop(); + } + if (!noMovementChange) + { + PlayerPrefs.SetInt("mouvement", (int)nextMouv); + } + if (IsQuickTeleport) + { + SceneManager.LoadScene(NextScene); + } + else + { + StartCoroutine("TimerExecute"); + } + } + private int count = 0; + IEnumerator TimerExecute() + { + count = 3; + while (true) + { + count--; + yield return new WaitForSeconds(1f); + if (count <= 0) + { + SceneManager.LoadScene(NextScene); + } + } + + } +} diff --git a/Assets/Scripts/HammerScript/Executable.cs.meta b/Assets/Scripts/HammerScript/Executable.cs.meta new file mode 100644 index 0000000..b702fbb --- /dev/null +++ b/Assets/Scripts/HammerScript/Executable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7db44b838a6a5f244ae1a368e8a33a81 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HammerScript/HammerTrigger.cs b/Assets/Scripts/HammerScript/HammerTrigger.cs new file mode 100644 index 0000000..4b62e19 --- /dev/null +++ b/Assets/Scripts/HammerScript/HammerTrigger.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class HammerTrigger : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + private void OnTriggerEnter(Collider other) + { + if (other.gameObject.tag == "Target") + { + Executable ex = other.gameObject.GetComponent("Executable") as Executable; + ex.Execute(); + } + } +} diff --git a/Assets/Scripts/HammerScript/HammerTrigger.cs.meta b/Assets/Scripts/HammerScript/HammerTrigger.cs.meta new file mode 100644 index 0000000..2284956 --- /dev/null +++ b/Assets/Scripts/HammerScript/HammerTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 371259076e90d4644bd42d907733d382 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Timer.cs b/Assets/Scripts/Timer.cs index 404cd16..e827ef4 100644 --- a/Assets/Scripts/Timer.cs +++ b/Assets/Scripts/Timer.cs @@ -17,7 +17,7 @@ public class Timer : MonoBehaviour void Start() { time = 0; - Coroutine timerRoutine = StartCoroutine("TimerExecute"); + timerRoutine = StartCoroutine("TimerExecute"); } private void FixedUpdate() @@ -29,6 +29,7 @@ public class Timer : MonoBehaviour public void Stop() { timerStop = true; + PlayerPrefs.SetString("Time", text.text); StopCoroutine(timerRoutine); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index baba073..293d477 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 0243577..5d5aa35 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,36 +6,33 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c72111f193f2b212d68252320092a - flags: 0 - RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c6c0404161f22380b29223f20193cf0ae2136ebf32f flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c6b231e16082f0f273422242d1221acf53a31f6fe flags: 0 - RecentlyUsedScenePath-3: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c75191b1a011a20293f373f26083de6ae2136ebf32f flags: 0 - RecentlyUsedScenePath-4: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c731500121465181b2e313d2c3e3cf0f23d3cedf578fce9332b25 flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c7315001214651f1b2e313d2c3e3cf0f23d3cedf578fce9332b25 flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b11001e1c1a20293f373f26083de6ae2136ebf32f flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7315001214651f3c34312a210910edf22631e6e824a7f234362820 flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c731500121465032a35242c2a1136cbee1931e6e33aeca92f31352d1b flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c73150012146501293c35633c133af6f9 flags: 0 - RecentlyUsedScenePath-2: + RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c72111f193f2b212d68252320092a flags: 0 vcSharedLogLevel: