diff --git a/Assets/Audio/Music.meta b/Assets/Audio/Music.meta new file mode 100644 index 0000000..6cd2688 --- /dev/null +++ b/Assets/Audio/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4edda58e4b61b974eaf5ce2e1d823a8c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/alta.mp3 b/Assets/Audio/Music/alta.mp3 new file mode 100644 index 0000000..71817b1 --- /dev/null +++ b/Assets/Audio/Music/alta.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a3e08b9ee9cf4ba64952a0fe2647351c74092540c57743bd79a3f05661c3f16 +size 205239 diff --git a/Assets/Audio/Music/alta.mp3.meta b/Assets/Audio/Music/alta.mp3.meta new file mode 100644 index 0000000..b0b762a --- /dev/null +++ b/Assets/Audio/Music/alta.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 060e1bc6145f114469e4312918bfc938 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/ambos.mp3 b/Assets/Audio/Music/ambos.mp3 new file mode 100644 index 0000000..91e654a --- /dev/null +++ b/Assets/Audio/Music/ambos.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:183cf113f1458a5046dd41b489522717a686a19aa8cb032700d4d8456a3d118f +size 205239 diff --git a/Assets/Audio/Music/ambos.mp3.meta b/Assets/Audio/Music/ambos.mp3.meta new file mode 100644 index 0000000..2a478fe --- /dev/null +++ b/Assets/Audio/Music/ambos.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ee06e4a2058e2734383fb169ad3645be +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/azul.mp3 b/Assets/Audio/Music/azul.mp3 new file mode 100644 index 0000000..6ce7626 --- /dev/null +++ b/Assets/Audio/Music/azul.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05e4722187311278938ba234e6ab3e9ce6b275e57814054f1ef14893306a0f3b +size 205239 diff --git a/Assets/Audio/Music/azul.mp3.meta b/Assets/Audio/Music/azul.mp3.meta new file mode 100644 index 0000000..31525b6 --- /dev/null +++ b/Assets/Audio/Music/azul.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7829b038dd09e2447809b75b3def0949 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/baja.mp3 b/Assets/Audio/Music/baja.mp3 new file mode 100644 index 0000000..a8b84d6 --- /dev/null +++ b/Assets/Audio/Music/baja.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09cf5f9d630232068bd1e61e9d2528f2e53f37501fcf6a0d00640f1ae792c67c +size 205239 diff --git a/Assets/Audio/Music/baja.mp3.meta b/Assets/Audio/Music/baja.mp3.meta new file mode 100644 index 0000000..c5b9f05 --- /dev/null +++ b/Assets/Audio/Music/baja.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8daea4f4eba9f9541802ec5b66ef9bee +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/hielo.mp3 b/Assets/Audio/Music/hielo.mp3 new file mode 100644 index 0000000..0618f7c --- /dev/null +++ b/Assets/Audio/Music/hielo.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35b875c0b8fb3873158f3ac8879bbb6ccb141003f4e777cecca683342e517d09 +size 205239 diff --git a/Assets/Audio/Music/hielo.mp3.meta b/Assets/Audio/Music/hielo.mp3.meta new file mode 100644 index 0000000..205ada3 --- /dev/null +++ b/Assets/Audio/Music/hielo.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fb985c8c6b305e04498266a627672f51 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/intro.mp3 b/Assets/Audio/Music/intro.mp3 new file mode 100644 index 0000000..5f02a52 --- /dev/null +++ b/Assets/Audio/Music/intro.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81637e7a89c4fb1db8215c1cc5bcc6d41f248edb3912ee7fd96deadc16fb1d57 +size 205239 diff --git a/Assets/Audio/Music/intro.mp3.meta b/Assets/Audio/Music/intro.mp3.meta new file mode 100644 index 0000000..f161555 --- /dev/null +++ b/Assets/Audio/Music/intro.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 300a1be276b9ceb48bbcdc06648fc3b8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/invertido.mp3 b/Assets/Audio/Music/invertido.mp3 new file mode 100644 index 0000000..98b2aab --- /dev/null +++ b/Assets/Audio/Music/invertido.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb681e78b41f1912b72fb191f874a4f5c3dd35c891c6d6061a8cc59c8cd46ef5 +size 205239 diff --git a/Assets/Audio/Music/invertido.mp3.meta b/Assets/Audio/Music/invertido.mp3.meta new file mode 100644 index 0000000..ec7f2be --- /dev/null +++ b/Assets/Audio/Music/invertido.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1433ff3a5fe05704d86d24aef8429be5 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/oscuro.mp3 b/Assets/Audio/Music/oscuro.mp3 new file mode 100644 index 0000000..f0c3d6a --- /dev/null +++ b/Assets/Audio/Music/oscuro.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26a4d82a3dee5cdb4152250bb4ebef230c6d5116dcd5222305e46ebc070c907c +size 205239 diff --git a/Assets/Audio/Music/oscuro.mp3.meta b/Assets/Audio/Music/oscuro.mp3.meta new file mode 100644 index 0000000..3287b5d --- /dev/null +++ b/Assets/Audio/Music/oscuro.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: eb5c18acaee4a6446bcf8a9d83bbcb24 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Music/rojo.mp3 b/Assets/Audio/Music/rojo.mp3 new file mode 100644 index 0000000..8216d7a --- /dev/null +++ b/Assets/Audio/Music/rojo.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b9af4f40a3367d617f99256bebb2084306f7d0957e5abd4cce5c20d2c2ad95bf +size 205239 diff --git a/Assets/Audio/Music/rojo.mp3.meta b/Assets/Audio/Music/rojo.mp3.meta new file mode 100644 index 0000000..24b3ec6 --- /dev/null +++ b/Assets/Audio/Music/rojo.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7b9e4bcfb7166be40add7539203203bd +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 0.59999996 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/SFX/Puerta.wav b/Assets/Audio/SFX/Puerta.wav index 82c8dda..cbf7009 100644 --- a/Assets/Audio/SFX/Puerta.wav +++ b/Assets/Audio/SFX/Puerta.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b346f517268890fba38397e0421eb6a6c4dc545d1f0a717ae4679c81b63055b2 -size 886484 +oid sha256:1acf40c1b6cc0d229116888f5631470f0b8d595ffbeb921d40a746b2d2e86a0c +size 266120 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index bdf588f..9de10dd 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -2093,7 +2093,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9dd2f647ee7b470488f36b4c923f42e0, type: 3} m_Name: m_EditorClassIdentifier: - endPosition: {x: 0, y: 16} + endPosition: {x: 0, y: 17} moveTime: 3 stopDuration: 2 --- !u!212 &182317458 @@ -4018,7 +4018,7 @@ MonoBehaviour: m_EditorClassIdentifier: endPosition: {x: 0, y: -16} moveTime: 3 - stopDuration: 1 + stopDuration: 2 --- !u!212 &486154738 SpriteRenderer: m_ObjectHideFlags: 0 @@ -4358,10 +4358,10 @@ Camera: m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 - x: 0.07075263 + x: 0.06953437 y: 0 - width: 0.85809964 - height: 0.999636 + width: 0.8611618 + height: 1.0003641 near clip plane: 0.3 far clip plane: 1000 field of view: 60 @@ -5431,7 +5431,7 @@ MonoBehaviour: m_EditorClassIdentifier: speed: 2 player: {fileID: 832780277} - accelerationPower: 10 + accelerationPower: 20 --- !u!1 &690816255 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index a4422c1..6a66c5b 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -432,7 +432,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 175, y: 270} + m_AnchoredPosition: {x: 75, y: 250} m_SizeDelta: {x: 157, y: 114} m_Pivot: {x: 0.5, y: 0} --- !u!114 &90779990 @@ -1419,7 +1419,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "MARC \nBATLLE\n@Atrichocke" + m_text: 'MARC BATLLE + + @Atrichocke' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 877e51cda7f313a49936e53f1dbd463e, type: 2} m_sharedMaterial: {fileID: 2836527389853980847, guid: 877e51cda7f313a49936e53f1dbd463e, type: 2} @@ -1446,8 +1448,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 8 + m_fontSizeBase: 8 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1636,6 +1638,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 581115830} m_CullTransparentMesh: 1 +--- !u!1 &633722878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 633722879} + - component: {fileID: 633722881} + - component: {fileID: 633722880} + m_Layer: 0 + m_Name: Pedro + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &633722879 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633722878} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1587434588} + m_Father: {fileID: 2128788496} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -75, y: 250} + m_SizeDelta: {x: 153, y: 116} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &633722880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633722878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 602e8490af8459946bc473a7c4a6d459, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &633722881 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633722878} + m_CullTransparentMesh: 1 --- !u!1 &636934696 GameObject: m_ObjectHideFlags: 0 @@ -2318,8 +2397,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 8 + m_fontSizeBase: 8 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -4404,10 +4483,10 @@ Camera: m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 - x: 0.22817722 + x: 0.06953437 y: 0 - width: 0.34811473 - height: 0.4055333 + width: 0.8611618 + height: 1.0003641 near clip plane: 0.3 far clip plane: 1000 field of view: 60 @@ -4499,6 +4578,143 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1 &1587434587 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1587434588} + - component: {fileID: 1587434590} + - component: {fileID: 1587434589} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1587434588 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587434587} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 633722879} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -126} + m_SizeDelta: {x: 230, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1587434589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587434587} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'PEDRO ASTASIO + + @Pedro_Astasio' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 877e51cda7f313a49936e53f1dbd463e, type: 2} + m_sharedMaterial: {fileID: 2836527389853980847, guid: 877e51cda7f313a49936e53f1dbd463e, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1587434590 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1587434587} + m_CullTransparentMesh: 1 --- !u!1 &1637653649 GameObject: m_ObjectHideFlags: 0 @@ -4717,143 +4933,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1757680813 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1757680814} - - component: {fileID: 1757680816} - - component: {fileID: 1757680815} - m_Layer: 0 - m_Name: Pedro - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1757680814 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757680813} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2128788496} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -80} - m_SizeDelta: {x: 215.06, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1757680815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757680813} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'MUSIC BY: - - PEDRO ASTASIO' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 877e51cda7f313a49936e53f1dbd463e, type: 2} - m_sharedMaterial: {fileID: 2836527389853980847, guid: 877e51cda7f313a49936e53f1dbd463e, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1757680816 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757680813} - m_CullTransparentMesh: 1 --- !u!1 &1772610418 GameObject: m_ObjectHideFlags: 0 @@ -5371,7 +5450,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 270} + m_AnchoredPosition: {x: -230, y: 250} m_SizeDelta: {x: 153, y: 116} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1890535988 @@ -5499,8 +5578,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 16 - m_fontSizeBase: 16 + m_fontSize: 8 + m_fontSizeBase: 8 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -5909,7 +5988,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -175, y: 270} + m_AnchoredPosition: {x: 230, y: 250} m_SizeDelta: {x: 137, y: 146} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2063607325 @@ -6186,7 +6265,7 @@ RectTransform: - {fileID: 2063607324} - {fileID: 90779989} - {fileID: 1890535987} - - {fileID: 1757680814} + - {fileID: 633722879} - {fileID: 1789754318} m_Father: {fileID: 338094512} m_RootOrder: 5 diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 35bd404..64b9b6f 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -63,7 +63,6 @@ public class GameManager : MonoBehaviour { if (!_doorOpened) { _doorOpened = true; AudioManager.instance.Play("Puerta"); - AudioManager.instance.FadeOut("Puerta", 1f); doorOpenEvent.Invoke(); } if (CurrentTime >= time && !_dead) { diff --git a/Assets/Scripts/Obstacles/MovingPlatform.cs b/Assets/Scripts/Obstacles/MovingPlatform.cs index b949930..96d7dea 100644 --- a/Assets/Scripts/Obstacles/MovingPlatform.cs +++ b/Assets/Scripts/Obstacles/MovingPlatform.cs @@ -31,7 +31,7 @@ public class MovingPlatform : MonoBehaviour { yield return new WaitForFixedUpdate(); transform.position = Vector3.MoveTowards(transform.position, _end, _speed * Time.deltaTime); - if (Math.Abs(transform.position.sqrMagnitude - _end.sqrMagnitude) < 0.05f) { + if (((Vector2)transform.position - _end).sqrMagnitude < 0.05f) { _swapRoutine ??= StartCoroutine(SwapCoordinates()); } } diff --git a/Assets/Scripts/SceneLoad.cs b/Assets/Scripts/SceneLoad.cs index 5540238..14343dd 100644 --- a/Assets/Scripts/SceneLoad.cs +++ b/Assets/Scripts/SceneLoad.cs @@ -7,7 +7,7 @@ using UnityEngine; public class SceneLoad : MonoBehaviour{ public void LoadScene(int sceneIndex) { - AudioManager.instance.FadeOut("Viento", 1f); + AudioManager.instance.StopAll(); Loader.Load(sceneIndex); } } diff --git a/Assets/Scripts/UI/CanvasController.cs b/Assets/Scripts/UI/CanvasController.cs index 0bf453c..105a28a 100644 --- a/Assets/Scripts/UI/CanvasController.cs +++ b/Assets/Scripts/UI/CanvasController.cs @@ -1,7 +1,9 @@ +using System; using System.Collections; using System.Collections.Generic; using DG.Tweening; using MyBox; +using SimpleTools.AudioManager; using UnityEngine; using UnityEngine.UI; @@ -28,15 +30,54 @@ public class CanvasController : MonoBehaviour { bool _abort; public void AbortCoroutine() => _abort = true; + + OrbTypes _currentType = OrbTypes.None; + void PlayEffectMusic() { + switch (_currentType) { + case OrbTypes.None: + AudioManager.instance.Play("intro"); + break; + case OrbTypes.Blue: + AudioManager.instance.Play("azul"); + break; + case OrbTypes.Red: + AudioManager.instance.Play("rojo"); + break; + case OrbTypes.Purple: + AudioManager.instance.Play("ambos"); + break; + case OrbTypes.InvertedControls: + AudioManager.instance.Play("invertido"); + break; + case OrbTypes.HighGravity: + AudioManager.instance.Play("alta"); + break; + case OrbTypes.LowGravity: + AudioManager.instance.Play("baja"); + break; + case OrbTypes.DarkRoom: + AudioManager.instance.Play("oscuro"); + break; + case OrbTypes.Freeze: + AudioManager.instance.Play("rojo"); + break; + default: + throw new ArgumentOutOfRangeException(); + } + } IEnumerator Countdown() { + PlayEffectMusic(); + for (int i = 0; i < 10; ++i) { orb.sprite = orbCountdown[i]; yield return new WaitForSeconds(1f); if (_abort) yield break; } - _effectImage.sprite = effectSprites[(int)GameManager.instance.SelectRandomEffect() - 1]; + _currentType = GameManager.instance.SelectRandomEffect(); + + _effectImage.sprite = effectSprites[(int)_currentType - 1]; effectTween.DORestart(); StartCoroutine(Countdown()); } diff --git a/Assets/Sounds.asset b/Assets/Sounds.asset index 27098d0..3234e99 100644 --- a/Assets/Sounds.asset +++ b/Assets/Sounds.asset @@ -114,3 +114,84 @@ MonoBehaviour: pitchVariance: 0 loop: 0 source: {fileID: 0} + - name: alta + clip: {fileID: 8300000, guid: 060e1bc6145f114469e4312918bfc938, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: ambos + clip: {fileID: 8300000, guid: ee06e4a2058e2734383fb169ad3645be, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: azul + clip: {fileID: 8300000, guid: 7829b038dd09e2447809b75b3def0949, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: baja + clip: {fileID: 8300000, guid: 8daea4f4eba9f9541802ec5b66ef9bee, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: hielo + clip: {fileID: 8300000, guid: fb985c8c6b305e04498266a627672f51, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: intro + clip: {fileID: 8300000, guid: 300a1be276b9ceb48bbcdc06648fc3b8, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: invertido + clip: {fileID: 8300000, guid: 1433ff3a5fe05704d86d24aef8429be5, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: oscuro + clip: {fileID: 8300000, guid: eb5c18acaee4a6446bcf8a9d83bbcb24, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} + - name: rojo + clip: {fileID: 8300000, guid: 7b9e4bcfb7166be40add7539203203bd, type: 3} + type: 0 + volume: 1 + volumeVariance: 0 + pitch: 1 + pitchVariance: 0 + loop: 0 + source: {fileID: 0} diff --git a/Assets/Sprites/credits_pedro.png b/Assets/Sprites/credits_pedro.png new file mode 100644 index 0000000..2a8032f --- /dev/null +++ b/Assets/Sprites/credits_pedro.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:126816e39732e3ef3d8b6d87738682338b0d1d2440b7bb66b4e0411933fd7c77 +size 2619 diff --git a/Assets/Sprites/credits_pedro.png.meta b/Assets/Sprites/credits_pedro.png.meta new file mode 100644 index 0000000..47bdd56 --- /dev/null +++ b/Assets/Sprites/credits_pedro.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 602e8490af8459946bc473a7c4a6d459 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 1ab77ab..41a08bc 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,22 +15,22 @@ EditorUserSettings: value: 5704065207060c08540f5c2645210844124f497e797871697f2b4e67b0b3626d flags: 0 RecentlyUsedSceneGuid-3: - value: 0000045255025a5a5a0c587012700d44454f1b7e792d73682c701f63bbb9323c - flags: 0 - RecentlyUsedSceneGuid-4: - value: 565404560306595a590d0d2044215a4414164b2c797924692b7b1936b3b4613a - flags: 0 - RecentlyUsedSceneGuid-5: value: 500102025056580a5f0b587a44735b4445151b297a717064797c1e66b2b2356e flags: 0 - RecentlyUsedSceneGuid-6: + RecentlyUsedSceneGuid-4: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 - RecentlyUsedSceneGuid-7: + RecentlyUsedSceneGuid-5: + value: 020957555d000f5f580c087715200a4444164a292d717e6179791832e1b7623e + flags: 0 + RecentlyUsedSceneGuid-6: value: 5a05575054505e025c5f5c7544770844434f1d7d7879743178711f31b2b9313c flags: 0 + RecentlyUsedSceneGuid-7: + value: 565404560306595a590d0d2044215a4414164b2c797924692b7b1936b3b4613a + flags: 0 RecentlyUsedSceneGuid-8: - value: 020957555d000f5f580c087715200a4444164a292d717e6179791832e1b7623e + value: 0000045255025a5a5a0c587012700d44454f1b7e792d73682c701f63bbb9323c flags: 0 RecentlyUsedSceneGuid-9: value: 540802035d055a5f5b595f2449200d4447154a79297b2365287e4d6ae6b96668 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 909a2ed..9d408be 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -47,7 +47,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 2261.4 + width: 2255 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -59,7 +59,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2826.75, y: 1373.5} + m_TargetSize: {x: 2818.75, y: 1373.5} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -74,8 +74,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1130.7001 - m_HBaseRangeMax: 1130.7001 + m_HBaseRangeMin: -1127.5 + m_HBaseRangeMax: 1127.5 m_VBaseRangeMin: -549.4 m_VBaseRangeMax: 549.4 m_HAllowExceedBaseRangeMin: 1 @@ -95,23 +95,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 2261.4 + width: 2255 height: 1098.8 - m_Scale: {x: 0.9999999, y: 0.9999999} - m_Translation: {x: 1130.7, y: 549.4} + m_Scale: {x: 1, y: 1} + m_Translation: {x: 1127.5, y: 549.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1130.7001 - y: -549.4001 - width: 2261.4001 - height: 1098.8002 + x: -1127.5 + y: -549.4 + width: 2255 + height: 1098.8 m_MinimalGUI: 1 - m_defaultScale: 0.9999999 - m_LastWindowPixelSize: {x: 2826.75, y: 1399.75} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 2818.75, y: 1399.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -136,7 +136,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2262.4 + width: 2256 height: 1586.8 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} @@ -159,16 +159,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2262.4 + width: 2256 height: 1140.8 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 5} - - {fileID: 2} - {fileID: 6} - m_Selected: 1 + - {fileID: 2} + m_Selected: 2 m_LastSelected: 0 --- !u!114 &5 MonoBehaviour: @@ -192,7 +192,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 2261.4 + width: 2255 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -268,7 +268,7 @@ MonoBehaviour: containerId: overlay-toolbar__top floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -428,9 +428,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.8825181, y: -2.650058, z: 0.17162266} + m_Target: {x: 3.651324, y: 2.8580036, z: 1.2878327} speed: 2 - m_Value: {x: 0.8825181, y: -2.650058, z: 0.17162266} + m_Value: {x: 3.651324, y: 2.8580036, z: 1.2878327} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -481,9 +481,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 44.73816 + m_Target: 9.022092 speed: 2 - m_Value: 44.73816 + m_Value: 9.022092 m_Ortho: m_Target: 1 speed: 2 @@ -562,12 +562,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1140.8 - width: 2262.4 + width: 2256 height: 446 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 11480 + controlID: 16395 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -585,7 +585,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 443.2 + width: 442.4 height: 446 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -616,7 +616,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1214.4 - width: 442.2 + width: 441.4 height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -625,9 +625,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: a611ffff - m_LastClickedID: 0 - m_ExpandedIDs: 5c46fffff046ffff0247ffff0c47ffff1647ffff1e47ffff3247ffffae49ffff424affff444cffff724cffff9e4cffffcc4cffff0e4dffff3661ffffc661ffffae63ffffba63ffffc463ffffd063fffff063ffffe86cffff766dffff026effffa06effff4c6fffffd46fffff7470ffffd67fffff7680ffff0afbffffc45b0000deb3000010b4000066c4000046c60000a4f500000ef70000 + m_SelectedIDs: 56e20000 + m_LastClickedID: 57942 + m_ExpandedIDs: 0463ffff8c63ffff6664fffff264ffff8065ffff0afbffff64e2000008e40000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -661,25 +661,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 443.2 + x: 442.4 y: 0 - width: 1819.2 + width: 1813.6 height: 446 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 11} m_Panes: - {fileID: 11} - {fileID: 12} - {fileID: 13} - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -700,9 +700,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 443.2 + x: 442.4 y: 1214.4 - width: 1817.2 + width: 1811.6 height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -721,22 +721,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Sprites m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Sprites m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\ggasc\GitHub\ListJam2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 1e620000 - m_LastClickedID: 25118 - m_ExpandedIDs: 000000001e62000020620000226200002462000026620000286200002a6200002c6200002e62000030620000326200003462000000ca9a3b + scrollPos: {x: 0, y: 27} + m_SelectedIDs: 0e620000 + m_LastClickedID: 25102 + m_ExpandedIDs: 000000000a6200000c6200000e62000010620000126200001462000016620000186200001a6200001c6200001e6200002062000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -764,7 +764,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001e62000020620000226200002462000026620000286200002a6200002c6200002e62000030620000326200003462000000ca9a3b + m_ExpandedIDs: 000000000a6200000c6200000e62000010620000126200001462000016620000186200001a6200001c6200001e6200002062000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -789,8 +789,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 56e20000 + m_LastClickedInstanceID: 57942 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000a86c0000c2600000b6aa0000f25d0000 m_RenameOverlay: @@ -840,9 +840,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 443.2 + x: 442.4 y: 1214.4 - width: 1817.2 + width: 1811.6 height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -878,7 +878,7 @@ MonoBehaviour: m_SaveData: [] m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 63040 + m_LastSelectedObjectID: 23360 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1070,9 +1070,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2262.4 + x: 2256 y: 0 - width: 809.6001 + width: 816 height: 1586.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -1101,9 +1101,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2262.4001 + x: 2256 y: 73.6 - width: 808.6001 + width: 815 height: 1565.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 0d7c692..024ba43 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 3072 height: 1636.8 m_ShowMode: 4 - m_Title: Game + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 11959 + controlID: 89 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2262.4 + width: 2256 height: 1586.8 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 11937 + controlID: 90 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -155,24 +155,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 2262.4 + width: 2256 height: 1140.8 - m_MinSize: {x: 101, y: 121} + m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 12} - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -192,12 +192,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1140.8 - width: 2262.4 + width: 2256 height: 446 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 11966 + controlID: 22 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -215,7 +215,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 443.2 + width: 442.4 height: 446 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -234,25 +234,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 443.2 + x: 442.4 y: 0 - width: 1819.2 + width: 1813.6 height: 446 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 232, y: 271} + m_MaxSize: {x: 10002, y: 10021} + m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} - {fileID: 17} - {fileID: 18} - {fileID: 19} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -268,9 +268,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2262.4 + x: 2256 y: 0 - width: 809.6001 + width: 816 height: 1586.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -301,7 +301,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 2261.4 + width: 2255 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -313,7 +313,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 2826.75, y: 1373.5} + m_TargetSize: {x: 2818.75, y: 1373.5} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -328,8 +328,8 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -1130.7001 - m_HBaseRangeMax: 1130.7001 + m_HBaseRangeMin: -1127.5 + m_HBaseRangeMax: 1127.5 m_VBaseRangeMin: -549.4 m_VBaseRangeMax: 549.4 m_HAllowExceedBaseRangeMin: 1 @@ -349,23 +349,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 2261.4 + width: 2255 height: 1098.8 - m_Scale: {x: 0.9999999, y: 0.9999999} - m_Translation: {x: 1130.7, y: 549.4} + m_Scale: {x: 1, y: 1} + m_Translation: {x: 1127.5, y: 549.4} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1130.7001 - y: -549.4001 - width: 2261.4001 - height: 1098.8002 + x: -1127.5 + y: -549.4 + width: 2255 + height: 1098.8 m_MinimalGUI: 1 - m_defaultScale: 0.9999999 - m_LastWindowPixelSize: {x: 2826.75, y: 1399.75} + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 2818.75, y: 1399.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -393,7 +393,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 2261.4 + width: 2255 height: 1119.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -629,9 +629,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.8825181, y: -2.650058, z: 0.17162266} + m_Target: {x: 36.62839, y: -5.2732716, z: 0.8353911} speed: 2 - m_Value: {x: 0.8825181, y: -2.650058, z: 0.17162266} + m_Value: {x: 34.808437, y: -6.6015096, z: 0.85588425} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -682,9 +682,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 44.73816 + m_Target: 47.58983 speed: 2 - m_Value: 44.73816 + m_Value: 45.540504 m_Ortho: m_Target: 1 speed: 2 @@ -766,7 +766,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 1214.4 - width: 442.2 + width: 441.4 height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -775,9 +775,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 32600000 m_LastClickedID: 0 - m_ExpandedIDs: d4f9feff54fafeff36fcfeff44fcfeff52fcfeff60fcfeff82fcfeff5c46fffff046ffff0247ffff0c47ffff1647ffff1e47ffff3247ffffae49ffff424affff444cffff724cffff9e4cffffcc4cffff0e4dffff3661ffffc661ffffae63ffffba63ffffc463ffffd063fffff063ffffe86cffff766dffff026effffa06effff4c6fffffd46fffff7470ffffd67fffff7680ffff0afbffffc45b0000deb3000010b4000066c4000046c60000a4f500000ef70000 + m_ExpandedIDs: a4f4ffff44f5ffffd4f5ffff44f7ffff0afbffff1a810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -821,9 +821,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 443.2 + x: 442.4 y: 1214.4 - width: 1817.2 + width: 1811.6 height: 425 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -842,22 +842,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Sprites m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets + - Assets/Sprites m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\ggasc\GitHub\ListJam2 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 1e620000 - m_LastClickedID: 25118 - m_ExpandedIDs: 000000001e62000020620000226200002462000026620000286200002a6200002c6200002e62000030620000326200003462000000ca9a3b + m_SelectedIDs: f65f0000 + m_LastClickedID: 24566 + m_ExpandedIDs: 00000000f25f0000f45f0000f65f0000f85f0000fa5f0000fc5f0000fe5f0000006000000260000004600000066000000860000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -885,7 +885,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001e62000020620000226200002462000026620000286200002a6200002c6200002e62000030620000326200003462000000ca9a3b + m_ExpandedIDs: 00000000f25f0000f45f0000f65f0000f85f0000fa5f0000fc5f0000fe5f00000060000002600000046000000660000008600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -912,7 +912,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000a86c0000c2600000b6aa0000f25d0000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1196,9 +1196,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2262.4001 + x: 2256 y: 73.6 - width: 808.6001 + width: 815 height: 1565.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: