diff --git a/Assets/AssetsFORELLE/Audio/Soundeffekte/pickupkey.wav b/Assets/AssetsFORELLE/Audio/Soundeffekte/pickupkey.wav new file mode 100644 index 0000000..820ced2 --- /dev/null +++ b/Assets/AssetsFORELLE/Audio/Soundeffekte/pickupkey.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1c6e438f79554504cbedfa9f6f826211170e30541d763feb04ef0ccf9eeb600 +size 221228 diff --git a/Assets/AssetsFORELLE/Audio/Soundeffekte/pickupkey.wav.meta b/Assets/AssetsFORELLE/Audio/Soundeffekte/pickupkey.wav.meta new file mode 100644 index 0000000..a88b146 --- /dev/null +++ b/Assets/AssetsFORELLE/Audio/Soundeffekte/pickupkey.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: d007af7bda8094bf6a5cfa9f63348c79 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AssetsFORELLE/Prefabs/Frank.prefab b/Assets/AssetsFORELLE/Prefabs/Frank.prefab index d03ea3c..3985724 100644 --- a/Assets/AssetsFORELLE/Prefabs/Frank.prefab +++ b/Assets/AssetsFORELLE/Prefabs/Frank.prefab @@ -20,6 +20,8 @@ GameObject: - component: {fileID: 8316039429838813759} - component: {fileID: 5185316313602682252} - component: {fileID: 7290952889933214358} + - component: {fileID: 1535821441} + - component: {fileID: 1535821442} m_Layer: 0 m_Name: Frank m_TagString: Player @@ -34,7 +36,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2410396854066836738} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -36.74, y: 2.17, z: -0.022044204} m_LocalScale: {x: 0.42547998, y: 0.3653795, z: 0.42548} m_ConstrainProportionsScale: 0 @@ -209,6 +211,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4760965f3d035f84db6a6741d746428c, type: 3} m_Name: m_EditorClassIdentifier: + audioSource: {fileID: 1535821442} + watschelSound: {fileID: 8300000, guid: 7a7507d8daac76346847d91274f41378, type: 3} + isPlaying: 0 --- !u!114 &8316039429838813759 MonoBehaviour: m_ObjectHideFlags: 0 @@ -235,6 +240,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5c8672c5b58eae84da6091aa48615de7, type: 3} m_Name: m_EditorClassIdentifier: + keyTakeSound: {fileID: 8300000, guid: d007af7bda8094bf6a5cfa9f63348c79, type: 3} + doorOpenSound: {fileID: 8300000, guid: 879f20b26c613da48b68f618ef7607e4, type: 3} --- !u!114 &7290952889933214358 MonoBehaviour: m_ObjectHideFlags: 0 @@ -249,3 +256,198 @@ MonoBehaviour: m_EditorClassIdentifier: isFalling: 0 counter: 0 + landeSound: {fileID: 8300000, guid: 183f7f089c24b164281e8c5053739412, type: 3} + sprungSound: {fileID: 8300000, guid: 3102ff7609304d84d824678029971c73, type: 3} + isJumping: 0 +--- !u!82 &1535821441 +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: 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!82 &1535821442 +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/Prefabs/SmallPressurePlate(N) Variant.prefab b/Assets/AssetsFORELLE/Prefabs/SmallPressurePlate(N) Variant.prefab index 1ff0ff8..f1068f0 100644 --- a/Assets/AssetsFORELLE/Prefabs/SmallPressurePlate(N) Variant.prefab +++ b/Assets/AssetsFORELLE/Prefabs/SmallPressurePlate(N) Variant.prefab @@ -59,6 +59,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3743697183328372287, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + propertyPath: audioSource + value: + objectReference: {fileID: 1318859952} - target: {fileID: 3743697183328372287, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} propertyPath: originalSprite value: @@ -71,8 +75,113 @@ PrefabInstance: propertyPath: activatedSprite value: objectReference: {fileID: 21300000, guid: dc19b5a3b36f9fe4fb4798db8a0ca25c, type: 3} + - target: {fileID: 3743697183328372287, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + propertyPath: buttonClickSound + value: + objectReference: {fileID: 8300000, guid: 4d73df53fe172084abe41ff9683bb08e, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} +--- !u!1 &1940356979551777536 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3743697183328372273, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} + m_PrefabInstance: {fileID: 2961610043285910833} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1318859952 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1940356979551777536} + 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 &1940356979551777539 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 3743697183328372274, guid: 703dddc0b1ed3464298fa5e1c7c25cf4, type: 3} diff --git a/Assets/AssetsFORELLE/Script/FallingDetection.cs b/Assets/AssetsFORELLE/Script/FallingDetection.cs index 58d72d5..0b7e846 100644 --- a/Assets/AssetsFORELLE/Script/FallingDetection.cs +++ b/Assets/AssetsFORELLE/Script/FallingDetection.cs @@ -7,28 +7,49 @@ public class FallingDetection : MonoBehaviour public bool isFalling; private Animator animator; public int counter = 0; + private bool wasFallingbefore = false; + private AudioSource audioSource; // Reference to the AudioSource component + public AudioClip landeSound; // The sound clip to be played + public AudioClip sprungSound; // The sound clip to be played + public bool isJumping = false; + private void Start() { animator = GetComponent(); playerRigidbody = GetComponent(); charController = gameObject.GetComponent(); + audioSource = GetComponent(); } private void Update() { Vector3 velocity = playerRigidbody.velocity; - + //Wenn nicht auf boden und geschwindigkeits offset pos + if (!charController.grounded && velocity.y > 0.1f && !isJumping){ + audioSource.PlayOneShot(sprungSound); + isJumping = true; + } + if(charController.grounded){ + isJumping = false; + } + //Wenn nicht auf boden und geschwindigkeits offset neg if (!charController.grounded && velocity.y < -0.1f) { + //Wenn er bereits fällt, oder der counter erreicht ist zum fallen if (isFalling || counter++>90) { isFalling = true; animator.SetBool("IsFalling", true); counter = 0; + wasFallingbefore = true; } } else { isFalling = false; counter = 0; animator.SetBool("IsFalling", false); + if(wasFallingbefore){ + wasFallingbefore = false; + audioSource.PlayOneShot(landeSound); + } } } } diff --git a/Assets/AssetsFORELLE/Script/InventoryBasic.cs b/Assets/AssetsFORELLE/Script/InventoryBasic.cs index d83c2cf..ea565e0 100644 --- a/Assets/AssetsFORELLE/Script/InventoryBasic.cs +++ b/Assets/AssetsFORELLE/Script/InventoryBasic.cs @@ -12,11 +12,15 @@ using UnityEngine; public class InventoryBasic : MonoBehaviour { private LinkedList items; + private AudioSource audioSource; // Reference to the AudioSource component + public AudioClip keyTakeSound; // The sound clip to be played + public AudioClip doorOpenSound; // The sound clip to be played // Start is called before the first frame update void Start() { items = new LinkedList(); + audioSource = GetComponent(); } // Update is called once per frame @@ -31,12 +35,14 @@ public class InventoryBasic : MonoBehaviour case "Item": other.gameObject.SetActive(false); items.AddFirst(other.gameObject); + audioSource.PlayOneShot(keyTakeSound); Debug.Log("Pickup: Take " + other.gameObject.name); break; case "Openable": if (removeFirstOccurence("KEY")) { + audioSource.PlayOneShot(doorOpenSound); other.gameObject.SetActive(false); Debug.Log("Pickup: Use Key"); } diff --git a/Assets/AssetsFORELLE/Script/IsMovingTester.cs b/Assets/AssetsFORELLE/Script/IsMovingTester.cs index 7485b28..3751ad1 100644 --- a/Assets/AssetsFORELLE/Script/IsMovingTester.cs +++ b/Assets/AssetsFORELLE/Script/IsMovingTester.cs @@ -6,11 +6,16 @@ public class IsMovingTester : MonoBehaviour { private Animator animator; private Rigidbody2D rb; + public AudioSource audioSource; // Reference to the AudioSource component + public AudioClip watschelSound; // The sound clip to be played + public bool isPlaying = false; // Boolean to control the sound loop + private FallingDetection fallingDetection; void Start() { animator = GetComponent(); rb = GetComponent(); + fallingDetection = gameObject.GetComponent(); } void Update() @@ -18,10 +23,24 @@ public class IsMovingTester : MonoBehaviour if (rb.velocity.magnitude > 0.1f) { animator.SetBool("IsMoving", true); + //Bewegt sich gerade und kein anderer Wert ist an, ausserdem Spielt es noch nicht + if (!animator.GetBool("IsPushing") && !animator.GetBool("IsFalling")&&!fallingDetection.isJumping){ + if(!isPlaying){ + audioSource.clip = watschelSound; + audioSource.loop = true; + audioSource.Play(); + isPlaying = true;} + } else { + audioSource.Stop(); + isPlaying = false; + } + } else { animator.SetBool("IsMoving", false); + audioSource.Stop(); + isPlaying = false; } } } diff --git a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs index 7745b9f..f80e662 100644 --- a/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs +++ b/Assets/AssetsFORELLE/Script/ObjPressurePlateMod.cs @@ -8,10 +8,13 @@ public GameObject door; public SpriteRenderer spriteRenderer; public Sprite originalSprite; public Sprite activatedSprite; +public AudioSource audioSource; // Reference to the AudioSource component +public AudioClip buttonClickSound; // The sound clip to be played +private bool isActive = false; // Start is called before the first frame update void Start() { - + audioSource = GetComponent(); } // Update is called once per frame @@ -24,6 +27,10 @@ void OnTriggerEnter2D(Collider2D other) { if (other.CompareTag("PressurePlatable")){ door.SetActive(false); spriteRenderer.sprite = activatedSprite; + if(!isActive){ + audioSource.PlayOneShot(buttonClickSound); + isActive = true; + } } } diff --git a/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs b/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs index eaddb4f..4280dee 100644 --- a/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs +++ b/Assets/AssetsFORELLE/Script/PlayerPressurePlateMod.cs @@ -5,14 +5,18 @@ using UnityEngine; public class PlayerPressurePlateMod: MonoBehaviour { - public SpriteRenderer spriteRenderer; +public SpriteRenderer spriteRenderer; public Sprite originalSprite; public Sprite activatedSprite; public GameObject door; +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() { - + audioSource = GetComponent(); } // Update is called once per frame @@ -26,6 +30,13 @@ void OnTriggerEnter2D(Collider2D other) { // spriteRenderer.sprite = activatedSprite; //} spriteRenderer.sprite = activatedSprite; + if(!isActive){ + audioSource.PlayOneShot(buttonClickSound); + audioSource.PlayOneShot(doorOpenSound); + isActive = true; + } + + door.SetActive(false); } diff --git a/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity b/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity index fcf7498..b07d619 100644 --- a/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity +++ b/Assets/Scenes/ScenesInGame/2PlatzhalterTutorial.unity @@ -878,6 +878,11 @@ 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} @@ -895,10 +900,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 414047046062880293, guid: 22badd0525f460b4d988841429f6a07e, type: 3} - propertyPath: _LevelManager1 - value: - objectReference: {fileID: 1535821428} - target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3} propertyPath: m_Name value: Frank @@ -947,18 +948,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2410396854066836747, guid: 22badd0525f460b4d988841429f6a07e, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2410396854066836747, guid: 22badd0525f460b4d988841429f6a07e, type: 3} - propertyPath: ShiftingEnabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7766790369216727835, guid: 22badd0525f460b4d988841429f6a07e, type: 3} - propertyPath: _LevelManager1 - value: - objectReference: {fileID: 1535821428} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 22badd0525f460b4d988841429f6a07e, type: 3} --- !u!1 &450159570 @@ -3566,6 +3555,102 @@ 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 @@ -4270,6 +4355,14 @@ 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 @@ -4444,6 +4537,14 @@ PrefabInstance: propertyPath: door value: objectReference: {fileID: 1198127828} + - target: {fileID: 1940356979551777550, guid: 2bffd5594aa1c224ba146958892fc23f, type: 3} + propertyPath: doorOpenSound + value: + objectReference: {fileID: 8300000, guid: 879f20b26c613da48b68f618ef7607e4, type: 3} + - target: {fileID: 1940356979551777550, guid: 2bffd5594aa1c224ba146958892fc23f, type: 3} + propertyPath: buttonClickSound + value: + objectReference: {fileID: 8300000, guid: caef5564ce6229347a94243ed1a4ec72, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2bffd5594aa1c224ba146958892fc23f, type: 3} --- !u!1 &1198127828 stripped @@ -10909,11 +11010,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 423786995679909254, guid: 8e6d3254e0ba866458c13eb9a4529fa2, type: 3} m_PrefabInstance: {fileID: 7779005557435341846} m_PrefabAsset: {fileID: 0} ---- !u!1 &1535821428 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3} - m_PrefabInstance: {fileID: 448203240} - m_PrefabAsset: {fileID: 0} --- !u!1 &1558493467 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity b/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity index 3554a2e..3726755 100644 --- a/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity +++ b/Assets/Scenes/ScenesInGame/3MeowlinTalk.unity @@ -3028,7 +3028,7 @@ Transform: - {fileID: 1231872279} - {fileID: 128503477} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &128503475 GameObject: @@ -3490,7 +3490,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 &730127465 GameObject: @@ -3890,7 +3890,7 @@ Transform: - {fileID: 1165796153} - {fileID: 918354101} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1145733377 GameObject: @@ -4008,7 +4008,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1165796151 GameObject: @@ -4920,8 +4920,65 @@ 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!1001 &1933191386 +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: 9 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.x + value: -10.36 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.y + value: -2.1 + 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 &1940315325 GameObject: m_ObjectHideFlags: 0 @@ -5002,239 +5059,3 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1940315325} m_CullTransparentMesh: 0 ---- !u!1 &2011196610 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2011196621} - - component: {fileID: 2011196620} - - component: {fileID: 2011196619} - - component: {fileID: 2011196618} - - component: {fileID: 2011196617} - - component: {fileID: 2011196616} - - component: {fileID: 2011196615} - - component: {fileID: 2011196614} - - component: {fileID: 2011196613} - - component: {fileID: 2011196612} - - component: {fileID: 2011196611} - m_Layer: 0 - m_Name: Frank - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2011196611 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4ea2b46765b2a94c81f15618d3ea519, type: 3} - m_Name: - m_EditorClassIdentifier: - isFalling: 0 - counter: 0 ---- !u!114 &2011196612 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a821d8b41cb035c44a9a7c0b05ede9c4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &2011196613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bef524aa2ad305d4faf6b90a610e5be4, type: 3} - m_Name: - m_EditorClassIdentifier: - inFirstDim: 1 - ShiftingEnabled: 0 ---- !u!114 &2011196614 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4760965f3d035f84db6a6741d746428c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!70 &2011196615 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - 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 &2011196616 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - 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 &2011196617 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - 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 &2011196618 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - 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 &2011196619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - 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 &2011196620 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - 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 &2011196621 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2011196610} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.69, 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: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/ScenesInGame/4DScene.unity b/Assets/Scenes/ScenesInGame/4DScene.unity index ab76916..776ba52 100644 --- a/Assets/Scenes/ScenesInGame/4DScene.unity +++ b/Assets/Scenes/ScenesInGame/4DScene.unity @@ -375,6 +375,63 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &73205718 +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: 8 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.x + value: -36.740005 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.y + value: 2.17 + 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!1001 &79266759 PrefabInstance: m_ObjectHideFlags: 0 @@ -1114,7 +1171,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1336267141} + - {fileID: 2054413317} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3321,6 +3378,67 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1249795132 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 449610414} + m_Modifications: + - target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_Name + value: Frank + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836740, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: mainCamera + value: + objectReference: {fileID: 176713580} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.x + value: -48.11 + objectReference: {fileID: 0} + - target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + propertyPath: m_LocalPosition.y + value: 4.4 + 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!1001 &1302334002 PrefabInstance: m_ObjectHideFlags: 0 @@ -3378,255 +3496,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 36f191eda52a886499b5b16518b8b85a, type: 3} ---- !u!1 &1336267132 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1336267141} - - component: {fileID: 1336267140} - - component: {fileID: 1336267139} - - component: {fileID: 1336267138} - - component: {fileID: 1336267137} - - component: {fileID: 1336267144} - - component: {fileID: 1336267136} - - component: {fileID: 1336267135} - - component: {fileID: 1336267134} - - component: {fileID: 1336267133} - - component: {fileID: 1336267142} - - component: {fileID: 1336267143} - m_Layer: 0 - m_Name: Frank - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1336267133 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bef524aa2ad305d4faf6b90a610e5be4, type: 3} - m_Name: - m_EditorClassIdentifier: - inFirstDim: 1 - ShiftingEnabled: 0 ---- !u!114 &1336267134 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4760965f3d035f84db6a6741d746428c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!70 &1336267135 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - 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 &1336267136 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - 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 &1336267137 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - 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 &1336267138 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - 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 &1336267139 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - 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: 176713580} - grounded: 0 ---- !u!212 &1336267140 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - 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 &1336267141 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -48.13, y: 4.38, z: 0.055622112} - m_LocalScale: {x: 0.42547998, y: 0.36538, z: 0.42547998} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 449610414} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1336267142 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a821d8b41cb035c44a9a7c0b05ede9c4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1336267143 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e4ea2b46765b2a94c81f15618d3ea519, type: 3} - m_Name: - m_EditorClassIdentifier: - isFalling: 0 - counter: 0 ---- !u!114 &1336267144 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1336267132} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5c8672c5b58eae84da6091aa48615de7, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1406162491 PrefabInstance: m_ObjectHideFlags: 0 @@ -20342,6 +20211,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2054413317 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3} + m_PrefabInstance: {fileID: 1249795132} + m_PrefabAsset: {fileID: 0} --- !u!1 &2082415039 GameObject: m_ObjectHideFlags: 0