From d3b407ea4831c651f6f6e2c58ba331a02ec02b9d Mon Sep 17 00:00:00 2001 From: DominikB Date: Sat, 24 Jun 2023 14:22:30 +0200 Subject: [PATCH] push sound --- .../BigPressurePlate_normal Variant.prefab | 113 +++++++ Assets/AssetsFORELLE/Prefabs/Frank.prefab | 100 ++++++ .../AssetsFORELLE/Script/IsPushingTester.cs | 12 + .../Script/ObjPressurePlateMod.cs | 2 + .../ScenesInGame/2PlatzhalterTutorial.unity | 109 ------ .../ScenesInGame/5.0TutorialDimShift.unity | 4 + Assets/Scenes/ScenesInGame/6.0Luna.unity | 277 ++++------------ Assets/Scenes/ScenesInGame/6.1Luna.unity | 281 ++++------------ Assets/Scenes/ScenesInGame/6.2Luna.unity | 283 ++++------------ Assets/Scenes/ScenesInGame/8Francois.unity | 309 ++++-------------- 10 files changed, 490 insertions(+), 1000 deletions(-) diff --git a/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab b/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab index 14f13a8..02b12b3 100644 --- a/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab +++ b/Assets/AssetsFORELLE/Prefabs/BigPressurePlate_normal Variant.prefab @@ -55,6 +55,14 @@ PrefabInstance: propertyPath: door value: objectReference: {fileID: 0} + - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: audioSource + value: + objectReference: {fileID: 853924419} + - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: doorOpenSound + value: + objectReference: {fileID: 8300000, guid: 879f20b26c613da48b68f618ef7607e4, type: 3} - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: originalSprite value: @@ -67,6 +75,10 @@ PrefabInstance: propertyPath: activatedSprite value: objectReference: {fileID: 21300000, guid: 05df8c93d6e1cc845a1ec24aed20a2ac, type: 3} + - target: {fileID: 1496965085621171596, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + propertyPath: buttonClickSound + value: + objectReference: {fileID: 8300000, guid: 4d73df53fe172084abe41ff9683bb08e, type: 3} - target: {fileID: 1496965085621171597, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} propertyPath: m_RootOrder value: 0 @@ -133,6 +145,107 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} +--- !u!1 &6694380534905033864 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1496965085621171599, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} + m_PrefabInstance: {fileID: 5197574467279216903} + m_PrefabAsset: {fileID: 0} +--- !u!82 &853924419 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694380534905033864} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!212 &6694380534905033865 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 1496965085621171598, guid: 189bceaa7696fbf49b6630e96185e2cf, type: 3} diff --git a/Assets/AssetsFORELLE/Prefabs/Frank.prefab b/Assets/AssetsFORELLE/Prefabs/Frank.prefab index 3985724..86a0a13 100644 --- a/Assets/AssetsFORELLE/Prefabs/Frank.prefab +++ b/Assets/AssetsFORELLE/Prefabs/Frank.prefab @@ -22,6 +22,7 @@ GameObject: - component: {fileID: 7290952889933214358} - component: {fileID: 1535821441} - component: {fileID: 1535821442} + - component: {fileID: 3210960092979103452} m_Layer: 0 m_Name: Frank m_TagString: Player @@ -183,6 +184,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a821d8b41cb035c44a9a7c0b05ede9c4, type: 3} m_Name: m_EditorClassIdentifier: + audioSource: {fileID: 3210960092979103452} + pushSound: {fileID: 8300000, guid: 79166d94ac54c0641807f1ab87349b61, type: 3} + isPlaying: 0 --- !u!70 &2410396854066836736 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -451,3 +455,99 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!82 &3210960092979103452 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2410396854066836738} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/AssetsFORELLE/Script/IsPushingTester.cs b/Assets/AssetsFORELLE/Script/IsPushingTester.cs index 87509c6..d46bb9f 100644 --- a/Assets/AssetsFORELLE/Script/IsPushingTester.cs +++ b/Assets/AssetsFORELLE/Script/IsPushingTester.cs @@ -7,6 +7,9 @@ public class IsPushingTester: MonoBehaviour private Animator animator; private Rigidbody2D rb; private bool isColliding; + public AudioSource audioSource; // Reference to the AudioSource component + public AudioClip pushSound; // The sound clip to be played + public bool isPlaying = false; // Boolean to control the sound loop void Start() @@ -21,11 +24,20 @@ public class IsPushingTester: MonoBehaviour if (isColliding && rb.velocity.magnitude > 0.1f) { animator.SetBool("IsPushing", true); + + if(!isPlaying){ + audioSource.clip = pushSound; + audioSource.loop = true; + audioSource.Play(); + isPlaying = true;} + } else { animator.SetBool("IsPushing", false); + audioSource.Stop(); + isPlaying = false; } } diff --git a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs index f80e662..651986c 100644 --- a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs +++ b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs @@ -10,6 +10,7 @@ public Sprite originalSprite; public Sprite activatedSprite; public AudioSource audioSource; // Reference to the AudioSource component public AudioClip buttonClickSound; // The sound clip to be played +public AudioClip doorOpenSound; private bool isActive = false; // Start is called before the first frame update void Start() @@ -29,6 +30,7 @@ void OnTriggerEnter2D(Collider2D other) { spriteRenderer.sprite = activatedSprite; if(!isActive){ audioSource.PlayOneShot(buttonClickSound); + audioSource.PlayOneShot(doorOpenSound); isActive = true; } } diff --git a/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity b/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity index 346b343..b3d3738 100644 --- a/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity +++ b/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity @@ -5668,11 +5668,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3} ---- !u!1 &401756009 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6694380534905033864, guid: 165a2208b0162fc41bc09f4b688b8750, type: 3} - m_PrefabInstance: {fileID: 1065178376} - m_PrefabAsset: {fileID: 0} --- !u!4 &423467059 stripped Transform: m_CorrespondingSourceObject: {fileID: 7932259858093015194, guid: b05f62fbadce49c4b9527f0b1c3e0bd2, type: 3} @@ -8345,102 +8340,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 6694380534905033866, guid: 165a2208b0162fc41bc09f4b688b8750, type: 3} m_PrefabInstance: {fileID: 1065178376} m_PrefabAsset: {fileID: 0} ---- !u!82 &853924419 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 401756009} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 --- !u!1001 &868557574 PrefabInstance: m_ObjectHideFlags: 0 @@ -9145,14 +9044,6 @@ PrefabInstance: propertyPath: door value: objectReference: {fileID: 89132131} - - target: {fileID: 6694380534905033867, guid: 165a2208b0162fc41bc09f4b688b8750, type: 3} - propertyPath: audioSource - value: - objectReference: {fileID: 853924419} - - target: {fileID: 6694380534905033867, guid: 165a2208b0162fc41bc09f4b688b8750, type: 3} - propertyPath: buttonClickSound - value: - objectReference: {fileID: 8300000, guid: 4d73df53fe172084abe41ff9683bb08e, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 165a2208b0162fc41bc09f4b688b8750, type: 3} --- !u!1 &1121927977 diff --git a/Assets/Scenes/ScenesInGame/5.0TutorialDimShift.unity b/Assets/Scenes/ScenesInGame/5.0TutorialDimShift.unity index e03758e..6ebc075 100644 --- a/Assets/Scenes/ScenesInGame/5.0TutorialDimShift.unity +++ b/Assets/Scenes/ScenesInGame/5.0TutorialDimShift.unity @@ -2514,6 +2514,10 @@ PrefabInstance: propertyPath: _LevelManager1 value: objectReference: {fileID: 760890964} + - target: {fileID: 8316039429838813759, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22badd0525f460b4d988841429f6a07e, type: 3} --- !u!1 &603214181 stripped diff --git a/Assets/Scenes/ScenesInGame/6.0Luna.unity b/Assets/Scenes/ScenesInGame/6.0Luna.unity index fc7f94f..90e6444 100644 --- a/Assets/Scenes/ScenesInGame/6.0Luna.unity +++ b/Assets/Scenes/ScenesInGame/6.0Luna.unity @@ -294,7 +294,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &270333165 GameObject: @@ -335,7 +335,7 @@ Transform: m_Children: - {fileID: 1917902393} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &388692237 GameObject: @@ -479,214 +479,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 4.1292434} m_EdgeRadius: 0 ---- !u!1 &538301742 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 538301743} - - component: {fileID: 538301751} - - component: {fileID: 538301750} - - component: {fileID: 538301749} - - component: {fileID: 538301748} - - component: {fileID: 538301747} - - component: {fileID: 538301746} - - component: {fileID: 538301745} - - component: {fileID: 538301744} - m_Layer: 0 - m_Name: Frank - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &538301743 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -9.03, y: -2.43, z: 0.033926} - m_LocalScale: {x: 0.42547998, y: 0.36538, z: 0.42547998} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &538301744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bef524aa2ad305d4faf6b90a610e5be4, type: 3} - m_Name: - m_EditorClassIdentifier: - inFirstDim: 1 - ShiftingEnabled: 0 ---- !u!114 &538301745 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4760965f3d035f84db6a6741d746428c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!70 &538301746 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.15, y: 0} - m_Size: {x: 1.64, y: 2.91} - m_Direction: 1 ---- !u!95 &538301747 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 44043e1d2a4d940438b0fdfee3f92bb0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!50 &538301748 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 0.6203294 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!70 &538301749 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.11321017, y: -0.15380491} - m_Size: {x: 1.9948646, y: 2.498772} - m_Direction: 0 ---- !u!114 &538301750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 57eab097b9fc58c4c88a5c9ba60e9c64, type: 3} - m_Name: - m_EditorClassIdentifier: - maxSpeed: 3.4 - jumpHeight: 8 - gravityScale: 1.5 - mainCamera: {fileID: 0} - grounded: 0 ---- !u!212 &538301751 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: bc1e36585ebd79d4db8ca18c1637587d, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.41, y: 3.203125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &815928805 GameObject: m_ObjectHideFlags: 0 @@ -796,7 +588,7 @@ Transform: m_Children: - {fileID: 1127557717} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &977048821 GameObject: @@ -4362,7 +4154,7 @@ Transform: - {fileID: 388692239} - {fileID: 1500431127} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1127557716 GameObject: @@ -4613,7 +4405,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1201044431 MonoBehaviour: @@ -4836,7 +4628,7 @@ Transform: - {fileID: 1705189951} - {fileID: 506482030} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1448341703 GameObject: @@ -5086,6 +4878,63 @@ Transform: m_Father: {fileID: 1094936217} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1641521629 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_Name + value: Frank + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.x + value: -9.6 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.y + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.z + value: -0.022044204 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 22badd0525f460b4d988841429f6a07e, type: 3} --- !u!1 &1656328243 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ScenesInGame/6.1Luna.unity b/Assets/Scenes/ScenesInGame/6.1Luna.unity index 0f50b54..b001d6f 100644 --- a/Assets/Scenes/ScenesInGame/6.1Luna.unity +++ b/Assets/Scenes/ScenesInGame/6.1Luna.unity @@ -409,7 +409,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &142608894 GameObject: @@ -594,7 +594,7 @@ Transform: - {fileID: 1135848025} - {fileID: 81957752} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &388692237 GameObject: @@ -678,7 +678,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &476559748 GameObject: @@ -966,214 +966,6 @@ MonoBehaviour: audio: {fileID: 0} saveInstance: {fileID: 0} goBackToOriginalStartAndBreak: 0 ---- !u!1 &538301742 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 538301743} - - component: {fileID: 538301751} - - component: {fileID: 538301750} - - component: {fileID: 538301749} - - component: {fileID: 538301748} - - component: {fileID: 538301747} - - component: {fileID: 538301746} - - component: {fileID: 538301745} - - component: {fileID: 538301744} - m_Layer: 0 - m_Name: Frank - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &538301743 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -11.38, y: -2.43, z: 0.033926} - m_LocalScale: {x: 0.42547998, y: 0.36538, z: 0.42547998} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &538301744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bef524aa2ad305d4faf6b90a610e5be4, type: 3} - m_Name: - m_EditorClassIdentifier: - inFirstDim: 1 - ShiftingEnabled: 0 ---- !u!114 &538301745 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4760965f3d035f84db6a6741d746428c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!70 &538301746 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.15, y: 0} - m_Size: {x: 1.64, y: 2.91} - m_Direction: 1 ---- !u!95 &538301747 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 44043e1d2a4d940438b0fdfee3f92bb0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!50 &538301748 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 0.6203294 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!70 &538301749 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.11321017, y: -0.15380491} - m_Size: {x: 1.9948646, y: 2.498772} - m_Direction: 0 ---- !u!114 &538301750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 57eab097b9fc58c4c88a5c9ba60e9c64, type: 3} - m_Name: - m_EditorClassIdentifier: - maxSpeed: 3.4 - jumpHeight: 8 - gravityScale: 1.5 - mainCamera: {fileID: 0} - grounded: 0 ---- !u!212 &538301751 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: bc1e36585ebd79d4db8ca18c1637587d, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.41, y: 3.203125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &744624672 GameObject: m_ObjectHideFlags: 0 @@ -1302,7 +1094,7 @@ Transform: m_Children: - {fileID: 523758847} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &889166774 GameObject: @@ -4986,7 +4778,7 @@ Transform: - {fileID: 207344225} - {fileID: 1844693281} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1088693749 GameObject: @@ -5145,7 +4937,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1135848024 GameObject: @@ -5401,8 +5193,65 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1577528499 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_Name + value: Frank (1) + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.x + value: -11.38 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.y + value: -2.43 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.z + value: 0.033926 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 22badd0525f460b4d988841429f6a07e, type: 3} --- !u!1 &1656328243 GameObject: m_ObjectHideFlags: 0 @@ -5591,7 +5440,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1844693280 GameObject: diff --git a/Assets/Scenes/ScenesInGame/6.2Luna.unity b/Assets/Scenes/ScenesInGame/6.2Luna.unity index 9013a73..54d8d2c 100644 --- a/Assets/Scenes/ScenesInGame/6.2Luna.unity +++ b/Assets/Scenes/ScenesInGame/6.2Luna.unity @@ -467,7 +467,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &181360220 GameObject: @@ -500,7 +500,7 @@ Transform: - {fileID: 67859885} - {fileID: 2014133213} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &270333165 GameObject: @@ -543,7 +543,7 @@ Transform: - {fileID: 1135848025} - {fileID: 81957752} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &373922782 GameObject: @@ -707,7 +707,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &476559748 GameObject: @@ -827,214 +827,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &538301742 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 538301743} - - component: {fileID: 538301751} - - component: {fileID: 538301750} - - component: {fileID: 538301749} - - component: {fileID: 538301748} - - component: {fileID: 538301747} - - component: {fileID: 538301746} - - component: {fileID: 538301745} - - component: {fileID: 538301744} - m_Layer: 0 - m_Name: Frank - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &538301743 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -11.25, y: -2.43, z: 0.033926} - m_LocalScale: {x: 0.42547998, y: 0.36538, z: 0.42547998} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &538301744 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bef524aa2ad305d4faf6b90a610e5be4, type: 3} - m_Name: - m_EditorClassIdentifier: - inFirstDim: 1 - ShiftingEnabled: 0 ---- !u!114 &538301745 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4760965f3d035f84db6a6741d746428c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!70 &538301746 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.15, y: 0} - m_Size: {x: 1.64, y: 2.91} - m_Direction: 1 ---- !u!95 &538301747 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 44043e1d2a4d940438b0fdfee3f92bb0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!50 &538301748 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 0.6203294 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!70 &538301749 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.11321017, y: -0.15380491} - m_Size: {x: 1.9948646, y: 2.498772} - m_Direction: 0 ---- !u!114 &538301750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 57eab097b9fc58c4c88a5c9ba60e9c64, type: 3} - m_Name: - m_EditorClassIdentifier: - maxSpeed: 3.4 - jumpHeight: 8 - gravityScale: 1.5 - mainCamera: {fileID: 0} - grounded: 0 ---- !u!212 &538301751 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 538301742} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: bc1e36585ebd79d4db8ca18c1637587d, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.41, y: 3.203125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &728898744 GameObject: m_ObjectHideFlags: 0 @@ -1176,7 +968,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &809677093 MonoBehaviour: @@ -1220,7 +1012,7 @@ Transform: m_Children: - {fileID: 1752197040} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &851287373 GameObject: @@ -5030,7 +4822,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1135848024 GameObject: @@ -5506,7 +5298,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1656328243 GameObject: @@ -5885,6 +5677,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1763860621} m_CullTransparentMesh: 0 +--- !u!1001 &1798978756 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_Name + value: Frank + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.x + value: -11.25 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.y + value: -2.43 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.z + value: 0.033926 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 22badd0525f460b4d988841429f6a07e, type: 3} --- !u!1 &1917902392 GameObject: m_ObjectHideFlags: 0 @@ -6163,5 +6012,5 @@ Transform: m_Children: - {fileID: 1263573113} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/ScenesInGame/8Francois.unity b/Assets/Scenes/ScenesInGame/8Francois.unity index e3c20ba..0f2f98e 100644 --- a/Assets/Scenes/ScenesInGame/8Francois.unity +++ b/Assets/Scenes/ScenesInGame/8Francois.unity @@ -203,242 +203,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 230027074} m_CullTransparentMesh: 0 ---- !u!1 &277825803 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 277825814} - - component: {fileID: 277825813} - - component: {fileID: 277825812} - - component: {fileID: 277825811} - - component: {fileID: 277825810} - - component: {fileID: 277825809} - - component: {fileID: 277825808} - - component: {fileID: 277825807} - - component: {fileID: 277825806} - - component: {fileID: 277825805} - - component: {fileID: 277825804} - m_Layer: 0 - m_Name: Frank - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &277825804 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4ea2b46765b2a94c81f15618d3ea519, type: 3} - m_Name: - m_EditorClassIdentifier: - isFalling: 0 - counter: 0 ---- !u!114 &277825805 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a821d8b41cb035c44a9a7c0b05ede9c4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &277825806 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bef524aa2ad305d4faf6b90a610e5be4, type: 3} - m_Name: - m_EditorClassIdentifier: - inFirstDim: 1 - ShiftingEnabled: 0 ---- !u!114 &277825807 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4760965f3d035f84db6a6741d746428c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!70 &277825808 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.15, y: 0} - m_Size: {x: 1.64, y: 2.91} - m_Direction: 1 ---- !u!95 &277825809 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 44043e1d2a4d940438b0fdfee3f92bb0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!50 &277825810 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 1 - m_Mass: 0.6203294 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!70 &277825811 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 9a162dcdc92b4194ba53630f8785bed1, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.11321017, y: -0.15380491} - m_Size: {x: 1.9948646, y: 2.498772} - m_Direction: 0 ---- !u!114 &277825812 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 57eab097b9fc58c4c88a5c9ba60e9c64, type: 3} - m_Name: - m_EditorClassIdentifier: - maxSpeed: 3.4 - jumpHeight: 8 - gravityScale: 1.5 - mainCamera: {fileID: 0} - grounded: 0 ---- !u!212 &277825813 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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: bc1e36585ebd79d4db8ca18c1637587d, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.41, y: 3.203125} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &277825814 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 277825803} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.47, y: -2.41, z: 0.033926} - m_LocalScale: {x: 0.42547998, y: 0.36538, z: 0.42547998} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &280246177 GameObject: m_ObjectHideFlags: 0 @@ -947,7 +711,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &614150785 GameObject: @@ -1228,7 +992,7 @@ Transform: - {fileID: 506113450} - {fileID: 1557538027} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &904302804 GameObject: @@ -4133,7 +3897,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1469582997 MonoBehaviour: @@ -4671,7 +4435,7 @@ Transform: - {fileID: 2056319320} - {fileID: 614150786} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1730066489 GameObject: @@ -4884,7 +4648,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1919077610 GameObject: @@ -5066,6 +4830,63 @@ MonoBehaviour: audio: {fileID: 0} saveInstance: {fileID: 0} goBackToOriginalStartAndBreak: 0 +--- !u!1001 &1947497895 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_Name + value: Frank + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.x + value: -3.47 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.y + value: -2.41 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.z + value: 0.033926 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 22badd0525f460b4d988841429f6a07e, type: 3} --- !u!1 &1957133637 GameObject: m_ObjectHideFlags: 0 @@ -5731,7 +5552,7 @@ Transform: m_Children: - {fileID: 1981567203} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2089310989 GameObject: @@ -6013,7 +5834,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2147274862 GameObject: @@ -6134,5 +5955,5 @@ Transform: m_Children: - {fileID: 2089310990} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}