diff --git a/Assets/Resources/Prefabs/Particle/Number.prefab b/Assets/Resources/Prefabs/Particle/Number.prefab index ebfd4d9d15..3e624f55eb 100644 --- a/Assets/Resources/Prefabs/Particle/Number.prefab +++ b/Assets/Resources/Prefabs/Particle/Number.prefab @@ -130,9 +130,9 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingLayerID: -755315459 + m_SortingLayer: 1 + m_SortingOrder: 654 m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &1320995819476395061 MonoBehaviour: diff --git a/Assets/Resources/Prefabs/Powerup/BlueShell.prefab b/Assets/Resources/Prefabs/Powerup/BlueShell.prefab index a0cdc4a0d3..1cd60caa04 100644 --- a/Assets/Resources/Prefabs/Powerup/BlueShell.prefab +++ b/Assets/Resources/Prefabs/Powerup/BlueShell.prefab @@ -5043,7 +5043,6 @@ MonoBehaviour: bouncePower: 0 terminalVelocity: 8 blinkingRate: 6 - passthrough: 0 avoidPlayers: 0 followMe: {fileID: 0} followMeCounter: 0 diff --git a/Assets/Resources/Sound/character/mario/warn.ogg b/Assets/Resources/Sound/character/mario/warn.ogg new file mode 100644 index 0000000000..7fd376a9fd Binary files /dev/null and b/Assets/Resources/Sound/character/mario/warn.ogg differ diff --git a/Assets/Resources/Sound/character/mario/warn.ogg.meta b/Assets/Resources/Sound/character/mario/warn.ogg.meta new file mode 100644 index 0000000000..c98a9921cb --- /dev/null +++ b/Assets/Resources/Sound/character/mario/warn.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4c9e47a00f7dd9241bfa6fe0e3637ea8 +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/Resources/Sound/ui/back.ogg b/Assets/Resources/Sound/ui/back.ogg index 4caddca70d..07bde8d28c 100644 Binary files a/Assets/Resources/Sound/ui/back.ogg and b/Assets/Resources/Sound/ui/back.ogg differ diff --git a/Assets/Resources/Sound/ui/cursor.ogg b/Assets/Resources/Sound/ui/cursor.ogg index e6c60dce5b..85bc6ecdd1 100644 Binary files a/Assets/Resources/Sound/ui/cursor.ogg and b/Assets/Resources/Sound/ui/cursor.ogg differ diff --git a/Assets/Resources/Sound/ui/decide.ogg b/Assets/Resources/Sound/ui/decide.ogg index eb0b7eafe0..d6cf947569 100644 Binary files a/Assets/Resources/Sound/ui/decide.ogg and b/Assets/Resources/Sound/ui/decide.ogg differ diff --git a/Assets/Resources/Sound/ui/file_select.ogg b/Assets/Resources/Sound/ui/file_select.ogg new file mode 100644 index 0000000000..619336a860 Binary files /dev/null and b/Assets/Resources/Sound/ui/file_select.ogg differ diff --git a/Assets/Resources/Sound/ui/file_select.ogg.meta b/Assets/Resources/Sound/ui/file_select.ogg.meta new file mode 100644 index 0000000000..cbbe599401 --- /dev/null +++ b/Assets/Resources/Sound/ui/file_select.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3671ea5c993f3dc448b0d801cdab09ba +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/Resources/Tilemaps/Palettes/Snow.prefab b/Assets/Resources/Tilemaps/Palettes/Snow.prefab index 0b59bd57a9..f72fc14491 100644 --- a/Assets/Resources/Tilemaps/Palettes/Snow.prefab +++ b/Assets/Resources/Tilemaps/Palettes/Snow.prefab @@ -281,9 +281,9 @@ Tilemap: - m_RefCount: 11 m_Data: {r: 1, g: 1, b: 1, a: 1} - m_RefCount: 1 - m_Data: {r: 0.9824452, g: 0.40414065, b: 0.46310884, a: 1} + m_Data: {r: 0.7392119, g: 0.3453774, b: 0.46443823, a: 1} - m_RefCount: 1 - m_Data: {r: 0.95041186, g: 0.5152633, b: 0.63036805, a: 1} + m_Data: {r: 0.80233777, g: 0.485372, b: 0.51634425, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/Levels/DefaultPipes.unity b/Assets/Scenes/Levels/DefaultPipes.unity index b7ddfd38de..cb7706bc62 100644 --- a/Assets/Scenes/Levels/DefaultPipes.unity +++ b/Assets/Scenes/Levels/DefaultPipes.unity @@ -452,9 +452,17 @@ CompositeCollider2D: - X: -185000000 Y: 20000000 - X: -185000000 + Y: 125000000 + - X: -190000000 + Y: 125000000 + - X: -190000000 Y: 165000000 - - X: 115000000 + - X: 120000000 Y: 165000000 + - X: 120000000 + Y: 125000000 + - X: 115000000 + Y: 125000000 - X: 115000000 Y: 20000000 - X: 105000000 @@ -646,8 +654,12 @@ CompositeCollider2D: - - {x: -17.5, y: 0.5} - {x: -17.5, y: 2} - {x: -18.5, y: 2} - - {x: -18.5, y: 16.5} - - {x: 11.5, y: 16.5} + - {x: -18.5, y: 12.5} + - {x: -19, y: 12.5} + - {x: -19, y: 16.5} + - {x: 12, y: 16.5} + - {x: 12, y: 12.5} + - {x: 11.5, y: 12.5} - {x: 11.5, y: 2} - {x: 10.5, y: 2} - {x: 10.5, y: 0.5} @@ -14087,8 +14099,8 @@ Tilemap: - first: {x: -38, y: 14, z: 0} second: serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 + m_TileIndex: 48 + m_TileSpriteIndex: 48 m_TileMatrixIndex: 1 m_TileColorIndex: 6 m_TileObjectToInstantiateIndex: 65535 @@ -14097,8 +14109,8 @@ Tilemap: - first: {x: 23, y: 14, z: 0} second: serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 + m_TileIndex: 49 + m_TileSpriteIndex: 49 m_TileMatrixIndex: 1 m_TileColorIndex: 6 m_TileObjectToInstantiateIndex: 65535 @@ -14204,26 +14216,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 15, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 15, z: 0} second: serializedVersion: 2 @@ -14324,26 +14316,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 16, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 16, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 16, z: 0} second: serializedVersion: 2 @@ -14444,26 +14416,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 17, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 17, z: 0} second: serializedVersion: 2 @@ -14564,26 +14516,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 18, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 18, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 18, z: 0} second: serializedVersion: 2 @@ -14684,26 +14616,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 19, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 19, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 19, z: 0} second: serializedVersion: 2 @@ -14804,26 +14716,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 20, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 20, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 20, z: 0} second: serializedVersion: 2 @@ -14924,26 +14816,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 21, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 21, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 21, z: 0} second: serializedVersion: 2 @@ -15044,26 +14916,6 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 2147483649 - - first: {x: -38, y: 22, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 33 - m_TileSpriteIndex: 33 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - - first: {x: 23, y: 22, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 34 - m_TileSpriteIndex: 34 - m_TileMatrixIndex: 1 - m_TileColorIndex: 6 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 2147483649 - first: {x: 24, y: 22, z: 0} second: serializedVersion: 2 @@ -20141,9 +19993,9 @@ Tilemap: m_Data: {fileID: 11400000, guid: db4bf36049049f44b8a0872553caf212, type: 2} - m_RefCount: 72 m_Data: {fileID: 11400000, guid: 90d34d8892457ad448f526ae9117eaf5, type: 2} - - m_RefCount: 260 + - m_RefCount: 251 m_Data: {fileID: 11400000, guid: 1aeb9c69fd730f044bb4886a1c5d6593, type: 2} - - m_RefCount: 260 + - m_RefCount: 251 m_Data: {fileID: 11400000, guid: 45add0e1fb9f6644d86f594d11830887, type: 2} - m_RefCount: 185 m_Data: {fileID: 11400000, guid: 2c2f5a6fbb211604e8b9089c66cbc5e7, type: 2} @@ -20171,9 +20023,9 @@ Tilemap: m_Data: {fileID: 11400000, guid: e5c9fc083dc7f7541bcbf5a4a6b1d6af, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 0d8a4e9bdba6dbd47902763f1702d429, type: 2} - - m_RefCount: 36 + - m_RefCount: 37 m_Data: {fileID: 11400000, guid: 63f1eb5a9357f0443b38953c1ecc0767, type: 2} - - m_RefCount: 36 + - m_RefCount: 37 m_Data: {fileID: 11400000, guid: 2789d286ab171f440b44955905a9d1cf, type: 2} m_TileSpriteArray: - m_RefCount: 0 @@ -20245,10 +20097,10 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 517 + - m_RefCount: 508 m_Data: {fileID: 1953404730678427167, guid: c55eba81d441d3f439e8289699cf72c8, type: 3} - - m_RefCount: 517 + - m_RefCount: 508 m_Data: {fileID: -2189814545099003515, guid: c55eba81d441d3f439e8289699cf72c8, type: 3} - m_RefCount: 0 @@ -20288,10 +20140,10 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 6088895996261290297, guid: f4b7221be8b79c94c9c8919163014cb0, type: 3} - - m_RefCount: 56 + - m_RefCount: 57 m_Data: {fileID: 7631404538767374335, guid: c55eba81d441d3f439e8289699cf72c8, type: 3} - - m_RefCount: 56 + - m_RefCount: 57 m_Data: {fileID: 3624413539235301459, guid: c55eba81d441d3f439e8289699cf72c8, type: 3} m_TileMatrixArray: @@ -20313,7 +20165,7 @@ Tilemap: e31: 6.6e-44 e32: 4.5904e-41 e33: 6.5e-43 - - m_RefCount: 1255 + - m_RefCount: 1239 m_Data: e00: 1 e01: 0 @@ -20344,7 +20196,7 @@ Tilemap: m_Data: {r: 2.1115e-41, g: 2.1115e-41, b: 2.1115e-41, a: 2.1115e-41} - m_RefCount: 0 m_Data: {r: 2.1115e-41, g: 2.1115e-41, b: 2.1115e-41, a: 2.1115e-41} - - m_RefCount: 1255 + - m_RefCount: 1239 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index b57ab96fb5..d4f1bb03b8 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1581,8 +1581,8 @@ RectTransform: m_Father: {fileID: 1947854095} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25323284} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -3154,8 +3154,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 264.99997, y: 0} - m_SizeDelta: {x: 529.99994, y: 1077.86} + m_AnchoredPosition: {x: 264.99994, y: 0} + m_SizeDelta: {x: 529.9999, y: 1077.86} m_Pivot: {x: 0.5, y: 1} --- !u!114 &111480245 MonoBehaviour: @@ -4283,6 +4283,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &161100439 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7417,7 +7429,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1916143647} m_Direction: 2 m_Value: 1 - m_Size: 0.2587971 + m_Size: 0.25884622 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -8934,6 +8946,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &378613058 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10448,6 +10472,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &414844264 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11993,6 +12029,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &452697247 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12379,7 +12427,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -20819,6 +20867,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &658850706 MonoBehaviour: m_ObjectHideFlags: 0 @@ -22212,6 +22272,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &699942807 MonoBehaviour: m_ObjectHideFlags: 0 @@ -25600,7 +25672,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 6, y: 0} - m_SizeDelta: {x: -40, y: 117.50006} + m_SizeDelta: {x: -40, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &823064027 MonoBehaviour: @@ -32287,12 +32359,12 @@ MonoBehaviour: lobbyPlayersSlider: {fileID: 448507887} changePlayersSlider: {fileID: 822715925} mainMenuSelected: {fileID: 452697243} - optionsSelected: {fileID: 1911492853} - lobbySelected: {fileID: 1949357578} + optionsSelected: {fileID: 1782708233} + lobbySelected: {fileID: 1587486719} currentLobbySelected: {fileID: 393919388} createLobbySelected: {fileID: 1375833479} creditsSelected: {fileID: 1722575666} - controlsSelected: {fileID: 1433659596} + controlsSelected: {fileID: 378613054} privateSelected: {fileID: 1974161483} reconnectSelected: {fileID: 393919388} updateBoxSelected: {fileID: 699942805} @@ -33043,7 +33115,7 @@ MonoBehaviour: m_Interactable: 1 m_TargetGraphic: {fileID: 489521904} toggleTransition: 1 - graphic: {fileID: 0} + graphic: {fileID: 765704810} m_Group: {fileID: 0} onValueChanged: m_PersistentCalls: @@ -33607,6 +33679,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &922932518 MonoBehaviour: m_ObjectHideFlags: 0 @@ -33788,6 +33872,171 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1.25 +--- !u!43 &925108426 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: i hate making my own meshes + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 864 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 290 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 9, y: 0.3125, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020001000300020003000400040003000500040005000600060005000700060007000800080007000900080009000a000a0009000b000a000b000c000c000b000d000c000d000e000e000d000f000e000f00100010000f001100100011001200120011001300120013001400140013001500140015001600160015001700160017001800180017001900180019001a001a0019001b001a001b001c001c001b001d001c001d001e001e001d001f001e001f00200020001f002100200021002200220021002300220023002400240023002500240025002600260025002700260027002800280027002900280029002a002a0029002b002a002b002c002c002b002d002c002d002e002e002d002f002e002f00300030002f003100300031003200320031003300320033003400340033003500340035003600360035003700360037003800380037003900380039003a003a0039003b003a003b003c003c003b003d003c003d003e003e003d003f003e003f00400040003f004100400041004200420041004300420043004400440043004500440045004600460045004700460047004800480047004900480049004a004a0049004b004a004b004c004c004b004d004c004d004e004e004d004f004e004f00500050004f005100500051005200520051005300520053005400540053005500540055005600560055005700560057005800580057005900580059005a005a0059005b005a005b005c005c005b005d005c005d005e005e005d005f005e005f00600060005f006100600061006200620061006300620063006400640063006500640065006600660065006700660067006800680067006900680069006a006a0069006b006a006b006c006c006b006d006c006d006e006e006d006f006e006f00700070006f007100700071007200720071007300720073007400740073007500740075007600760075007700760077007800780077007900780079007a007a0079007b007a007b007c007c007b007d007c007d007e007e007d007f007e007f00800080007f008100800081008200820081008300820083008400840083008500840085008600860085008700860087008800880087008900880089008a008a0089008b008a008b008c008c008b008d008c008d008e008e008d008f008e008f00900090008f009100900091009200920091009300920093009400940093009500940095009600960095009700960097009800980097009900980099009a009a0099009b009a009b009c009c009b009d009c009d009e009e009d009f009e009f00a000a0009f00a100a000a100a200a200a100a300a200a300a400a400a300a500a400a500a600a600a500a700a600a700a800a800a700a900a800a900aa00aa00a900ab00aa00ab00ac00ac00ab00ad00ac00ad00ae00ae00ad00af00ae00af00b000b000af00b100b000b100b200b200b100b300b200b300b400b400b300b500b400b500b600b600b500b700b600b700b800b800b700b900b800b900ba00ba00b900bb00ba00bb00bc00bc00bb00bd00bc00bd00be00be00bd00bf00be00bf00c000c000bf00c100c000c100c200c200c100c300c200c300c400c400c300c500c400c500c600c600c500c700c600c700c800c800c700c900c800c900ca00ca00c900cb00ca00cb00cc00cc00cb00cd00cc00cd00ce00ce00cd00cf00ce00cf00d000d000cf00d100d000d100d200d200d100d300d200d300d400d400d300d500d400d500d600d600d500d700d600d700d800d800d700d900d800d900da00da00d900db00da00db00dc00dc00db00dd00dc00dd00de00de00dd00df00de00df00e000e000df00e100e000e100e200e200e100e300e200e300e400e400e300e500e400e500e600e600e500e700e600e700e800e800e700e900e800e900ea00ea00e900eb00ea00eb00ec00ec00eb00ed00ec00ed00ee00ee00ed00ef00ee00ef00f000f000ef00f100f000f100f200f200f100f300f200f300f400f400f300f500f400f500f600f600f500f700f600f700f800f800f700f900f800f900fa00fa00f900fb00fa00fb00fc00fc00fb00fd00fc00fd00fe00fe00fd00ff00fe00ff0000010001ff000101000101010201020101010301020103010401040103010501040105010601060105010701060107010801080107010901080109010a010a0109010b010a010b010c010c010b010d010c010d010e010e010d010f010e010f01100110010f011101100111011201120111011301120113011401140113011501140115011601160115011701160117011801180117011901180119011a011a0119011b011a011b011c011c011b011d011c011d011e011e011d011f011e011f01200120011f012101 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 290 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 5800 + _typelessdata: 000010c10000a0be000000000000000000000000000010c10000a03e0000000078fce13b0000803f00000ec10000a0be0000000078fce13b0000000000000ec10000a03e0000000078fc613c0000803f00000cc10000a0be0000000078fc613c0000000000000cc10000a03e000000005a7da93c0000803f00000ac10000a0be000000005a7da93c0000000000000ac10000a03e0000000078fce13c0000803f000008c10000a0be0000000078fce13c00000000000008c10000a03e00000000cb3d0d3d0000803f000006c10000a0be00000000cb3d0d3d00000000000006c10000a03e000000005a7d293d0000803f000004c10000a0be000000005a7d293d00000000000004c10000a03e00000000e9bc453d0000803f000002c10000a0be00000000e9bc453d00000000000002c10000a03e0000000078fc613d0000803f000000c10000a0be0000000078fc613d00000000000000c10000a03e00000000073c7e3d0000803f0000fcc00000a0be00000000073c7e3d000000000000fcc00000a03e00000000cb3d8d3d0000803f0000f8c00000a0be00000000cb3d8d3d000000000000f8c00000a03e00000000935d9b3d0000803f0000f4c00000a0be00000000935d9b3d000000000000f4c00000a03e000000005a7da93d0000803f0000f0c00000a0be000000005a7da93d000000000000f0c00000a03e00000000229db73d0000803f0000ecc00000a0be00000000229db73d000000000000ecc00000a03e00000000e9bcc53d0000803f0000e8c00000a0be00000000e9bcc53d000000000000e8c00000a03e00000000b1dcd33d0000803f0000e4c00000a0be00000000b1dcd33d000000000000e4c00000a03e0000000078fce13d0000803f0000e0c00000a0be0000000078fce13d000000000000e0c00000a03e00000000401cf03d0000803f0000dcc00000a0be00000000401cf03d000000000000dcc00000a03e00000000073cfe3d0000803f0000d8c00000a0be00000000073cfe3d000000000000d8c00000a03e00000000e72d063e0000803f0000d4c00000a0be00000000e72d063e000000000000d4c00000a03e00000000cb3d0d3e0000803f0000d0c00000a0be00000000cb3d0d3e000000000000d0c00000a03e00000000af4d143e0000803f0000ccc00000a0be00000000af4d143e000000000000ccc00000a03e00000000935d1b3e0000803f0000c8c00000a0be00000000935d1b3e000000000000c8c00000a03e00000000766d223e0000803f0000c4c00000a0be00000000766d223e000000000000c4c00000a03e000000005a7d293e0000803f0000c0c00000a0be000000005a7d293e000000000000c0c00000a03e000000003e8d303e0000803f0000bcc00000a0be000000003e8d303e000000000000bcc00000a03e00000000229d373e0000803f0000b8c00000a0be00000000229d373e000000000000b8c00000a03e0000000005ad3e3e0000803f0000b4c00000a0be0000000005ad3e3e000000000000b4c00000a03e00000000e9bc453e0000803f0000b0c00000a0be00000000e9bc453e000000000000b0c00000a03e00000000cdcc4c3e0000803f0000acc00000a0be00000000cdcc4c3e000000000000acc00000a03e00000000b1dc533e0000803f0000a8c00000a0be00000000b1dc533e000000000000a8c00000a03e0000000094ec5a3e0000803f0000a4c00000a0be0000000094ec5a3e000000000000a4c00000a03e0000000078fc613e0000803f0000a0c00000a0be0000000078fc613e000000000000a0c00000a03e000000005c0c693e0000803f00009cc00000a0be000000005c0c693e0000000000009cc00000a03e00000000401c703e0000803f000098c00000a0be00000000401c703e00000000000098c00000a03e00000000232c773e0000803f000094c00000a0be00000000232c773e00000000000094c00000a03e00000000073c7e3e0000803f000090c00000a0be00000000073c7e3e00000000000090c00000a03e00000000f5a5823e0000803f00008cc00000a0be00000000f5a5823e0000000000008cc00000a03e00000000e72d863e0000803f000088c00000a0be00000000e72d863e00000000000088c00000a03e00000000d9b5893e0000803f000084c00000a0be00000000d9b5893e00000000000084c00000a03e00000000cb3d8d3e0000803f000080c00000a0be00000000cb3d8d3e00000000000080c00000a03e00000000bdc5903e0000803f000078c00000a0be00000000bdc5903e00000000000078c00000a03e00000000af4d943e0000803f000070c00000a0be00000000af4d943e00000000000070c00000a03e00000000a1d5973e0000803f000068c00000a0be00000000a1d5973e00000000000068c00000a03e00000000935d9b3e0000803f000060c00000a0be00000000935d9b3e00000000000060c00000a03e0000000084e59e3e0000803f000058c00000a0be0000000084e59e3e00000000000058c00000a03e00000000766da23e0000803f000050c00000a0be00000000766da23e00000000000050c00000a03e0000000068f5a53e0000803f000048c00000a0be0000000068f5a53e00000000000048c00000a03e000000005a7da93e0000803f000040c00000a0be000000005a7da93e00000000000040c00000a03e000000004c05ad3e0000803f000038c00000a0be000000004c05ad3e00000000000038c00000a03e000000003e8db03e0000803f000030c00000a0be000000003e8db03e00000000000030c00000a03e000000003015b43e0000803f000028c00000a0be000000003015b43e00000000000028c00000a03e00000000229db73e0000803f000020c00000a0be00000000229db73e00000000000020c00000a03e000000001325bb3e0000803f000018c00000a0be000000001325bb3e00000000000018c00000a03e0000000005adbe3e0000803f000010c00000a0be0000000005adbe3e00000000000010c00000a03e00000000f734c23e0000803f000008c00000a0be00000000f734c23e00000000000008c00000a03e00000000e9bcc53e0000803f000000c00000a0be00000000e9bcc53e00000000000000c00000a03e00000000db44c93e0000803f0000f0bf0000a0be00000000db44c93e000000000000f0bf0000a03e00000000cdcccc3e0000803f0000e0bf0000a0be00000000cdcccc3e000000000000e0bf0000a03e00000000bf54d03e0000803f0000d0bf0000a0be00000000bf54d03e000000000000d0bf0000a03e00000000b1dcd33e0000803f0000c0bf0000a0be00000000b1dcd33e000000000000c0bf0000a03e00000000a264d73e0000803f0000b0bf0000a0be00000000a264d73e000000000000b0bf0000a03e0000000094ecda3e0000803f0000a0bf0000a0be0000000094ecda3e000000000000a0bf0000a03e000000008674de3e0000803f000090bf0000a0be000000008674de3e00000000000090bf0000a03e0000000078fce13e0000803f000080bf0000a0be0000000078fce13e00000000000080bf0000a03e000000006a84e53e0000803f000060bf0000a0be000000006a84e53e00000000000060bf0000a03e000000005c0ce93e0000803f000040bf0000a0be000000005c0ce93e00000000000040bf0000a03e000000004e94ec3e0000803f000020bf0000a0be000000004e94ec3e00000000000020bf0000a03e00000000401cf03e0000803f000000bf0000a0be00000000401cf03e00000000000000bf0000a03e0000000031a4f33e0000803f0000c0be0000a0be0000000031a4f33e000000000000c0be0000a03e00000000232cf73e0000803f000080be0000a0be00000000232cf73e00000000000080be0000a03e0000000015b4fa3e0000803f000000be0000a0be0000000015b4fa3e00000000000000be0000a03e00000000073cfe3e0000803f000000000000a0be00000000073cfe3e00000000000000000000a03e00000000fce1003f0000803f0000003e0000a0be00000000fce1003f000000000000003e0000a03e00000000f5a5023f0000803f0000803e0000a0be00000000f5a5023f000000000000803e0000a03e00000000ee69043f0000803f0000c03e0000a0be00000000ee69043f000000000000c03e0000a03e00000000e72d063f0000803f0000003f0000a0be00000000e72d063f000000000000003f0000a03e00000000e0f1073f0000803f0000203f0000a0be00000000e0f1073f000000000000203f0000a03e00000000d9b5093f0000803f0000403f0000a0be00000000d9b5093f000000000000403f0000a03e00000000d2790b3f0000803f0000603f0000a0be00000000d2790b3f000000000000603f0000a03e00000000cb3d0d3f0000803f0000803f0000a0be00000000cb3d0d3f000000000000803f0000a03e00000000c4010f3f0000803f0000903f0000a0be00000000c4010f3f000000000000903f0000a03e00000000bdc5103f0000803f0000a03f0000a0be00000000bdc5103f000000000000a03f0000a03e00000000b689123f0000803f0000b03f0000a0be00000000b689123f000000000000b03f0000a03e00000000af4d143f0000803f0000c03f0000a0be00000000af4d143f000000000000c03f0000a03e00000000a811163f0000803f0000d03f0000a0be00000000a811163f000000000000d03f0000a03e00000000a1d5173f0000803f0000e03f0000a0be00000000a1d5173f000000000000e03f0000a03e000000009a99193f0000803f0000f03f0000a0be000000009a99193f000000000000f03f0000a03e00000000935d1b3f0000803f000000400000a0be00000000935d1b3f00000000000000400000a03e000000008b211d3f0000803f000008400000a0be000000008b211d3f00000000000008400000a03e0000000084e51e3f0000803f000010400000a0be0000000084e51e3f00000000000010400000a03e000000007da9203f0000803f000018400000a0be000000007da9203f00000000000018400000a03e00000000766d223f0000803f000020400000a0be00000000766d223f00000000000020400000a03e000000006f31243f0000803f000028400000a0be000000006f31243f00000000000028400000a03e0000000068f5253f0000803f000030400000a0be0000000068f5253f00000000000030400000a03e0000000061b9273f0000803f000038400000a0be0000000061b9273f00000000000038400000a03e000000005a7d293f0000803f000040400000a0be000000005a7d293f00000000000040400000a03e0000000053412b3f0000803f000048400000a0be0000000053412b3f00000000000048400000a03e000000004c052d3f0000803f000050400000a0be000000004c052d3f00000000000050400000a03e0000000045c92e3f0000803f000058400000a0be0000000045c92e3f00000000000058400000a03e000000003e8d303f0000803f000060400000a0be000000003e8d303f00000000000060400000a03e000000003751323f0000803f000068400000a0be000000003751323f00000000000068400000a03e000000003015343f0000803f000070400000a0be000000003015343f00000000000070400000a03e0000000029d9353f0000803f000078400000a0be0000000029d9353f00000000000078400000a03e00000000229d373f0000803f000080400000a0be00000000229d373f00000000000080400000a03e000000001a61393f0000803f000084400000a0be000000001a61393f00000000000084400000a03e0000000013253b3f0000803f000088400000a0be0000000013253b3f00000000000088400000a03e000000000ce93c3f0000803f00008c400000a0be000000000ce93c3f0000000000008c400000a03e0000000005ad3e3f0000803f000090400000a0be0000000005ad3e3f00000000000090400000a03e00000000fe70403f0000803f000094400000a0be00000000fe70403f00000000000094400000a03e00000000f734423f0000803f000098400000a0be00000000f734423f00000000000098400000a03e00000000f0f8433f0000803f00009c400000a0be00000000f0f8433f0000000000009c400000a03e00000000e9bc453f0000803f0000a0400000a0be00000000e9bc453f000000000000a0400000a03e00000000e280473f0000803f0000a4400000a0be00000000e280473f000000000000a4400000a03e00000000db44493f0000803f0000a8400000a0be00000000db44493f000000000000a8400000a03e00000000d4084b3f0000803f0000ac400000a0be00000000d4084b3f000000000000ac400000a03e00000000cdcc4c3f0000803f0000b0400000a0be00000000cdcc4c3f000000000000b0400000a03e00000000c6904e3f0000803f0000b4400000a0be00000000c6904e3f000000000000b4400000a03e00000000bf54503f0000803f0000b8400000a0be00000000bf54503f000000000000b8400000a03e00000000b818523f0000803f0000bc400000a0be00000000b818523f000000000000bc400000a03e00000000b1dc533f0000803f0000c0400000a0be00000000b1dc533f000000000000c0400000a03e00000000a9a0553f0000803f0000c4400000a0be00000000a9a0553f000000000000c4400000a03e00000000a264573f0000803f0000c8400000a0be00000000a264573f000000000000c8400000a03e000000009b28593f0000803f0000cc400000a0be000000009b28593f000000000000cc400000a03e0000000094ec5a3f0000803f0000d0400000a0be0000000094ec5a3f000000000000d0400000a03e000000008db05c3f0000803f0000d4400000a0be000000008db05c3f000000000000d4400000a03e0000000086745e3f0000803f0000d8400000a0be0000000086745e3f000000000000d8400000a03e000000007f38603f0000803f0000dc400000a0be000000007f38603f000000000000dc400000a03e0000000078fc613f0000803f0000e0400000a0be0000000078fc613f000000000000e0400000a03e0000000071c0633f0000803f0000e4400000a0be0000000071c0633f000000000000e4400000a03e000000006a84653f0000803f0000e8400000a0be000000006a84653f000000000000e8400000a03e000000006348673f0000803f0000ec400000a0be000000006348673f000000000000ec400000a03e000000005c0c693f0000803f0000f0400000a0be000000005c0c693f000000000000f0400000a03e0000000055d06a3f0000803f0000f4400000a0be0000000055d06a3f000000000000f4400000a03e000000004e946c3f0000803f0000f8400000a0be000000004e946c3f000000000000f8400000a03e0000000047586e3f0000803f0000fc400000a0be0000000047586e3f000000000000fc400000a03e00000000401c703f0000803f000000410000a0be00000000401c703f00000000000000410000a03e0000000038e0713f0000803f000002410000a0be0000000038e0713f00000000000002410000a03e0000000031a4733f0000803f000004410000a0be0000000031a4733f00000000000004410000a03e000000002a68753f0000803f000006410000a0be000000002a68753f00000000000006410000a03e00000000232c773f0000803f000008410000a0be00000000232c773f00000000000008410000a03e000000001cf0783f0000803f00000a410000a0be000000001cf0783f0000000000000a410000a03e0000000015b47a3f0000803f00000c410000a0be0000000015b47a3f0000000000000c410000a03e000000000e787c3f0000803f00000e410000a0be000000000e787c3f0000000000000e410000a03e00000000073c7e3f0000803f000010410000a0be00000000073c7e3f00000000000010410000a03e000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 9, y: 0.3125, z: 0} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &927866350 GameObject: m_ObjectHideFlags: 0 @@ -34260,7 +34509,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 24, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -37182,6 +37431,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1116787013 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37784,6 +38045,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1139030227 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37934,7 +38207,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20.000027} m_Pivot: {x: 0.5, y: 0.5} @@ -38989,6 +39262,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1181212336 MonoBehaviour: m_ObjectHideFlags: 0 @@ -40722,6 +41007,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1261109728 MonoBehaviour: m_ObjectHideFlags: 0 @@ -41711,7 +42008,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 2035097948} + objectReference: {fileID: 925108426} - target: {fileID: 2500780753419200967, guid: 2dd296828f2080541ab2b41eeda650a7, type: 3} propertyPath: height @@ -41941,171 +42238,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288748825} m_CullTransparentMesh: 0 ---- !u!43 &1293022577 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: i hate making my own meshes - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 0 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 0 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: - m_VertexData: - serializedVersion: 3 - m_VertexCount: 2 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 40 - _typelessdata: 000000000000a0be000000000000000000000000000000000000a03e000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0.3125, z: 0} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1295334845 GameObject: m_ObjectHideFlags: 0 @@ -42392,9 +42524,9 @@ RectTransform: m_Father: {fileID: 1657549222} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 299.99994, y: 0} m_SizeDelta: {x: 520, y: 51.4} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1305885201 @@ -42887,7 +43019,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1325357896 RectTransform: m_ObjectHideFlags: 0 @@ -42912,6 +43044,171 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 1} +--- !u!43 &1325434615 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: i hate making my own meshes + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 720 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 242 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 0.3125, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020001000300020003000400040003000500040005000600060005000700060007000800080007000900080009000a000a0009000b000a000b000c000c000b000d000c000d000e000e000d000f000e000f00100010000f001100100011001200120011001300120013001400140013001500140015001600160015001700160017001800180017001900180019001a001a0019001b001a001b001c001c001b001d001c001d001e001e001d001f001e001f00200020001f002100200021002200220021002300220023002400240023002500240025002600260025002700260027002800280027002900280029002a002a0029002b002a002b002c002c002b002d002c002d002e002e002d002f002e002f00300030002f003100300031003200320031003300320033003400340033003500340035003600360035003700360037003800380037003900380039003a003a0039003b003a003b003c003c003b003d003c003d003e003e003d003f003e003f00400040003f004100400041004200420041004300420043004400440043004500440045004600460045004700460047004800480047004900480049004a004a0049004b004a004b004c004c004b004d004c004d004e004e004d004f004e004f00500050004f005100500051005200520051005300520053005400540053005500540055005600560055005700560057005800580057005900580059005a005a0059005b005a005b005c005c005b005d005c005d005e005e005d005f005e005f00600060005f006100600061006200620061006300620063006400640063006500640065006600660065006700660067006800680067006900680069006a006a0069006b006a006b006c006c006b006d006c006d006e006e006d006f006e006f00700070006f007100700071007200720071007300720073007400740073007500740075007600760075007700760077007800780077007900780079007a007a0079007b007a007b007c007c007b007d007c007d007e007e007d007f007e007f00800080007f008100800081008200820081008300820083008400840083008500840085008600860085008700860087008800880087008900880089008a008a0089008b008a008b008c008c008b008d008c008d008e008e008d008f008e008f00900090008f009100900091009200920091009300920093009400940093009500940095009600960095009700960097009800980097009900980099009a009a0099009b009a009b009c009c009b009d009c009d009e009e009d009f009e009f00a000a0009f00a100a000a100a200a200a100a300a200a300a400a400a300a500a400a500a600a600a500a700a600a700a800a800a700a900a800a900aa00aa00a900ab00aa00ab00ac00ac00ab00ad00ac00ad00ae00ae00ad00af00ae00af00b000b000af00b100b000b100b200b200b100b300b200b300b400b400b300b500b400b500b600b600b500b700b600b700b800b800b700b900b800b900ba00ba00b900bb00ba00bb00bc00bc00bb00bd00bc00bd00be00be00bd00bf00be00bf00c000c000bf00c100c000c100c200c200c100c300c200c300c400c400c300c500c400c500c600c600c500c700c600c700c800c800c700c900c800c900ca00ca00c900cb00ca00cb00cc00cc00cb00cd00cc00cd00ce00ce00cd00cf00ce00cf00d000d000cf00d100d000d100d200d200d100d300d200d300d400d400d300d500d400d500d600d600d500d700d600d700d800d800d700d900d800d900da00da00d900db00da00db00dc00dc00db00dd00dc00dd00de00de00dd00df00de00df00e000e000df00e100e000e100e200e200e100e300e200e300e400e400e300e500e400e500e600e600e500e700e600e700e800e800e700e900e800e900ea00ea00e900eb00ea00eb00ec00ec00eb00ed00ec00ed00ee00ee00ed00ef00ee00ef00f000f000ef00f100 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 242 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 4840 + _typelessdata: 0000f0c00000a0be0000000000000000000000000000f0c00000a03e00000000ab67073c0000803f0000ecc00000a0be00000000ab67073c000000000000ecc00000a03e00000000ab67873c0000803f0000e8c00000a0be00000000ab67873c000000000000e8c00000a03e00000000811bcb3c0000803f0000e4c00000a0be00000000811bcb3c000000000000e4c00000a03e00000000ab67073d0000803f0000e0c00000a0be00000000ab67073d000000000000e0c00000a03e000000009641293d0000803f0000dcc00000a0be000000009641293d000000000000dcc00000a03e00000000811b4b3d0000803f0000d8c00000a0be00000000811b4b3d000000000000d8c00000a03e000000006cf56c3d0000803f0000d4c00000a0be000000006cf56c3d000000000000d4c00000a03e00000000ab67873d0000803f0000d0c00000a0be00000000ab67873d000000000000d0c00000a03e00000000a154983d0000803f0000ccc00000a0be00000000a154983d000000000000ccc00000a03e000000009641a93d0000803f0000c8c00000a0be000000009641a93d000000000000c8c00000a03e000000008c2eba3d0000803f0000c4c00000a0be000000008c2eba3d000000000000c4c00000a03e00000000811bcb3d0000803f0000c0c00000a0be00000000811bcb3d000000000000c0c00000a03e000000007608dc3d0000803f0000bcc00000a0be000000007608dc3d000000000000bcc00000a03e000000006cf5ec3d0000803f0000b8c00000a0be000000006cf5ec3d000000000000b8c00000a03e0000000061e2fd3d0000803f0000b4c00000a0be0000000061e2fd3d000000000000b4c00000a03e00000000ab67073e0000803f0000b0c00000a0be00000000ab67073e000000000000b0c00000a03e0000000026de0f3e0000803f0000acc00000a0be0000000026de0f3e000000000000acc00000a03e00000000a154183e0000803f0000a8c00000a0be00000000a154183e000000000000a8c00000a03e000000001ccb203e0000803f0000a4c00000a0be000000001ccb203e000000000000a4c00000a03e000000009641293e0000803f0000a0c00000a0be000000009641293e000000000000a0c00000a03e0000000011b8313e0000803f00009cc00000a0be0000000011b8313e0000000000009cc00000a03e000000008c2e3a3e0000803f000098c00000a0be000000008c2e3a3e00000000000098c00000a03e0000000006a5423e0000803f000094c00000a0be0000000006a5423e00000000000094c00000a03e00000000811b4b3e0000803f000090c00000a0be00000000811b4b3e00000000000090c00000a03e00000000fc91533e0000803f00008cc00000a0be00000000fc91533e0000000000008cc00000a03e0000000076085c3e0000803f000088c00000a0be0000000076085c3e00000000000088c00000a03e00000000f17e643e0000803f000084c00000a0be00000000f17e643e00000000000084c00000a03e000000006cf56c3e0000803f000080c00000a0be000000006cf56c3e00000000000080c00000a03e00000000e76b753e0000803f000078c00000a0be00000000e76b753e00000000000078c00000a03e0000000061e27d3e0000803f000070c00000a0be0000000061e27d3e00000000000070c00000a03e000000006e2c833e0000803f000068c00000a0be000000006e2c833e00000000000068c00000a03e00000000ab67873e0000803f000060c00000a0be00000000ab67873e00000000000060c00000a03e00000000e9a28b3e0000803f000058c00000a0be00000000e9a28b3e00000000000058c00000a03e0000000026de8f3e0000803f000050c00000a0be0000000026de8f3e00000000000050c00000a03e000000006319943e0000803f000048c00000a0be000000006319943e00000000000048c00000a03e00000000a154983e0000803f000040c00000a0be00000000a154983e00000000000040c00000a03e00000000de8f9c3e0000803f000038c00000a0be00000000de8f9c3e00000000000038c00000a03e000000001ccba03e0000803f000030c00000a0be000000001ccba03e00000000000030c00000a03e000000005906a53e0000803f000028c00000a0be000000005906a53e00000000000028c00000a03e000000009641a93e0000803f000020c00000a0be000000009641a93e00000000000020c00000a03e00000000d47cad3e0000803f000018c00000a0be00000000d47cad3e00000000000018c00000a03e0000000011b8b13e0000803f000010c00000a0be0000000011b8b13e00000000000010c00000a03e000000004ef3b53e0000803f000008c00000a0be000000004ef3b53e00000000000008c00000a03e000000008c2eba3e0000803f000000c00000a0be000000008c2eba3e00000000000000c00000a03e00000000c969be3e0000803f0000f0bf0000a0be00000000c969be3e000000000000f0bf0000a03e0000000006a5c23e0000803f0000e0bf0000a0be0000000006a5c23e000000000000e0bf0000a03e0000000044e0c63e0000803f0000d0bf0000a0be0000000044e0c63e000000000000d0bf0000a03e00000000811bcb3e0000803f0000c0bf0000a0be00000000811bcb3e000000000000c0bf0000a03e00000000be56cf3e0000803f0000b0bf0000a0be00000000be56cf3e000000000000b0bf0000a03e00000000fc91d33e0000803f0000a0bf0000a0be00000000fc91d33e000000000000a0bf0000a03e0000000039cdd73e0000803f000090bf0000a0be0000000039cdd73e00000000000090bf0000a03e000000007608dc3e0000803f000080bf0000a0be000000007608dc3e00000000000080bf0000a03e00000000b443e03e0000803f000060bf0000a0be00000000b443e03e00000000000060bf0000a03e00000000f17ee43e0000803f000040bf0000a0be00000000f17ee43e00000000000040bf0000a03e000000002fbae83e0000803f000020bf0000a0be000000002fbae83e00000000000020bf0000a03e000000006cf5ec3e0000803f000000bf0000a0be000000006cf5ec3e00000000000000bf0000a03e00000000a930f13e0000803f0000c0be0000a0be00000000a930f13e000000000000c0be0000a03e00000000e76bf53e0000803f000080be0000a0be00000000e76bf53e00000000000080be0000a03e0000000024a7f93e0000803f000000be0000a0be0000000024a7f93e00000000000000be0000a03e0000000061e2fd3e0000803f000000000000a0be0000000061e2fd3e00000000000000000000a03e00000000cf0e013f0000803f0000003e0000a0be00000000cf0e013f000000000000003e0000a03e000000006e2c033f0000803f0000803e0000a0be000000006e2c033f000000000000803e0000a03e000000000d4a053f0000803f0000c03e0000a0be000000000d4a053f000000000000c03e0000a03e00000000ab67073f0000803f0000003f0000a0be00000000ab67073f000000000000003f0000a03e000000004a85093f0000803f0000203f0000a0be000000004a85093f000000000000203f0000a03e00000000e9a20b3f0000803f0000403f0000a0be00000000e9a20b3f000000000000403f0000a03e0000000087c00d3f0000803f0000603f0000a0be0000000087c00d3f000000000000603f0000a03e0000000026de0f3f0000803f0000803f0000a0be0000000026de0f3f000000000000803f0000a03e00000000c5fb113f0000803f0000903f0000a0be00000000c5fb113f000000000000903f0000a03e000000006319143f0000803f0000a03f0000a0be000000006319143f000000000000a03f0000a03e000000000237163f0000803f0000b03f0000a0be000000000237163f000000000000b03f0000a03e00000000a154183f0000803f0000c03f0000a0be00000000a154183f000000000000c03f0000a03e000000003f721a3f0000803f0000d03f0000a0be000000003f721a3f000000000000d03f0000a03e00000000de8f1c3f0000803f0000e03f0000a0be00000000de8f1c3f000000000000e03f0000a03e000000007dad1e3f0000803f0000f03f0000a0be000000007dad1e3f000000000000f03f0000a03e000000001ccb203f0000803f000000400000a0be000000001ccb203f00000000000000400000a03e00000000bae8223f0000803f000008400000a0be00000000bae8223f00000000000008400000a03e000000005906253f0000803f000010400000a0be000000005906253f00000000000010400000a03e00000000f823273f0000803f000018400000a0be00000000f823273f00000000000018400000a03e000000009641293f0000803f000020400000a0be000000009641293f00000000000020400000a03e00000000355f2b3f0000803f000028400000a0be00000000355f2b3f00000000000028400000a03e00000000d47c2d3f0000803f000030400000a0be00000000d47c2d3f00000000000030400000a03e00000000729a2f3f0000803f000038400000a0be00000000729a2f3f00000000000038400000a03e0000000011b8313f0000803f000040400000a0be0000000011b8313f00000000000040400000a03e00000000b0d5333f0000803f000048400000a0be00000000b0d5333f00000000000048400000a03e000000004ef3353f0000803f000050400000a0be000000004ef3353f00000000000050400000a03e00000000ed10383f0000803f000058400000a0be00000000ed10383f00000000000058400000a03e000000008c2e3a3f0000803f000060400000a0be000000008c2e3a3f00000000000060400000a03e000000002a4c3c3f0000803f000068400000a0be000000002a4c3c3f00000000000068400000a03e00000000c9693e3f0000803f000070400000a0be00000000c9693e3f00000000000070400000a03e000000006887403f0000803f000078400000a0be000000006887403f00000000000078400000a03e0000000006a5423f0000803f000080400000a0be0000000006a5423f00000000000080400000a03e00000000a5c2443f0000803f000084400000a0be00000000a5c2443f00000000000084400000a03e0000000044e0463f0000803f000088400000a0be0000000044e0463f00000000000088400000a03e00000000e2fd483f0000803f00008c400000a0be00000000e2fd483f0000000000008c400000a03e00000000811b4b3f0000803f000090400000a0be00000000811b4b3f00000000000090400000a03e0000000020394d3f0000803f000094400000a0be0000000020394d3f00000000000094400000a03e00000000be564f3f0000803f000098400000a0be00000000be564f3f00000000000098400000a03e000000005d74513f0000803f00009c400000a0be000000005d74513f0000000000009c400000a03e00000000fc91533f0000803f0000a0400000a0be00000000fc91533f000000000000a0400000a03e000000009aaf553f0000803f0000a4400000a0be000000009aaf553f000000000000a4400000a03e0000000039cd573f0000803f0000a8400000a0be0000000039cd573f000000000000a8400000a03e00000000d8ea593f0000803f0000ac400000a0be00000000d8ea593f000000000000ac400000a03e0000000076085c3f0000803f0000b0400000a0be0000000076085c3f000000000000b0400000a03e0000000015265e3f0000803f0000b4400000a0be0000000015265e3f000000000000b4400000a03e00000000b443603f0000803f0000b8400000a0be00000000b443603f000000000000b8400000a03e000000005361623f0000803f0000bc400000a0be000000005361623f000000000000bc400000a03e00000000f17e643f0000803f0000c0400000a0be00000000f17e643f000000000000c0400000a03e00000000909c663f0000803f0000c4400000a0be00000000909c663f000000000000c4400000a03e000000002fba683f0000803f0000c8400000a0be000000002fba683f000000000000c8400000a03e00000000cdd76a3f0000803f0000cc400000a0be00000000cdd76a3f000000000000cc400000a03e000000006cf56c3f0000803f0000d0400000a0be000000006cf56c3f000000000000d0400000a03e000000000b136f3f0000803f0000d4400000a0be000000000b136f3f000000000000d4400000a03e00000000a930713f0000803f0000d8400000a0be00000000a930713f000000000000d8400000a03e00000000484e733f0000803f0000dc400000a0be00000000484e733f000000000000dc400000a03e00000000e76b753f0000803f0000e0400000a0be00000000e76b753f000000000000e0400000a03e000000008589773f0000803f0000e4400000a0be000000008589773f000000000000e4400000a03e0000000024a7793f0000803f0000e8400000a0be0000000024a7793f000000000000e8400000a03e00000000c3c47b3f0000803f0000ec400000a0be00000000c3c47b3f000000000000ec400000a03e0000000061e27d3f0000803f0000f0400000a0be0000000061e27d3f000000000000f0400000a03e000000000000803f0000803f + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 0.3125, z: 0} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1328916951 GameObject: m_ObjectHideFlags: 0 @@ -43072,6 +43369,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!222 &1328916956 CanvasRenderer: m_ObjectHideFlags: 0 @@ -43718,6 +44027,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1362432726 MonoBehaviour: m_ObjectHideFlags: 0 @@ -44607,6 +44928,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1375444075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -44725,6 +45058,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1375833481 MonoBehaviour: m_ObjectHideFlags: 0 @@ -46436,6 +46781,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1433659601 MonoBehaviour: m_ObjectHideFlags: 0 @@ -47161,7 +47518,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -9.0000305, y: 0} - m_SizeDelta: {x: 172, y: 12} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 1} --- !u!114 &1472937422 MonoBehaviour: @@ -77278,6 +77635,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1587486724 MonoBehaviour: m_ObjectHideFlags: 0 @@ -77641,7 +78010,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -245.99994, y: -137.99997} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1603668786 MonoBehaviour: @@ -78261,7 +78630,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 51.4} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1657549223 MonoBehaviour: @@ -78813,8 +79182,8 @@ RectTransform: m_Father: {fileID: 1378308995} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -79626,6 +79995,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1722575671 MonoBehaviour: m_ObjectHideFlags: 0 @@ -79749,7 +80130,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 17.45 + m_fontSize: 17.5 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -79890,7 +80271,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1730034125 RectTransform: m_ObjectHideFlags: 0 @@ -81335,7 +81716,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1293022577} + objectReference: {fileID: 1325434615} - target: {fileID: 2500780753419200967, guid: 2dd296828f2080541ab2b41eeda650a7, type: 3} propertyPath: height @@ -86782,6 +87163,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1911492858 MonoBehaviour: m_ObjectHideFlags: 0 @@ -86854,7 +87247,7 @@ RectTransform: m_Father: {fileID: 1512785374} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.7412029} + m_AnchorMin: {x: 0, y: 0.7411538} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 24, y: 20} @@ -88349,6 +88742,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: BackSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1949357580 MonoBehaviour: m_ObjectHideFlags: 0 @@ -88754,6 +89159,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: ConfirmSound + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1974161485 MonoBehaviour: m_ObjectHideFlags: 0 @@ -90123,171 +90540,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2010868012} m_CullTransparentMesh: 1 ---- !u!43 &2035097948 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: i hate making my own meshes - serializedVersion: 11 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 0 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 0 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: - m_VertexData: - serializedVersion: 3 - m_VertexCount: 2 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 12 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 40 - _typelessdata: 000000000000a0be000000000000000000000000000000000000a03e000000000000803f0000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0.3125, z: 0} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &2036188049 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Entity/Player/PlayerAnimationController.cs b/Assets/Scripts/Entity/Player/PlayerAnimationController.cs index 807379117d..528dcd4b21 100644 --- a/Assets/Scripts/Entity/Player/PlayerAnimationController.cs +++ b/Assets/Scripts/Entity/Player/PlayerAnimationController.cs @@ -217,7 +217,7 @@ public void UpdateAnimatorStates() { animator.SetBool("blueshell", controller.state == Enums.PowerupState.BlueShell); animator.SetBool("mini", controller.state == Enums.PowerupState.MiniMushroom); animator.SetBool("mega", controller.state == Enums.PowerupState.MegaMushroom); - animator.SetBool("inShell", controller.inShell || (controller.state == Enums.PowerupState.BlueShell && (controller.crouching || (controller.groundpound && controller.groundpoundStartTimer <= 0.2f)))); + animator.SetBool("inShell", controller.inShell || (controller.state == Enums.PowerupState.BlueShell && (controller.crouching || controller.groundpound) && controller.groundpoundCounter <= 0.15f)); } else { //controller.wallSlideLeft = animator.GetBool("onLeft"); //controller.wallSlideRight = animator.GetBool("onRight"); @@ -342,7 +342,7 @@ void UpdateHitbox() { height = heightLargeModel; } - if (controller.state != Enums.PowerupState.MiniMushroom && ((controller.crouching && !controller.groundpound) || controller.inShell || controller.sliding || controller.triplejump)) + if (controller.state != Enums.PowerupState.MiniMushroom && controller.pipeEntering == null && ((controller.crouching && !controller.groundpound) || controller.inShell || controller.sliding || controller.triplejump)) height *= controller.state <= Enums.PowerupState.Small ? 0.7f : 0.5f; mainHitbox.size = new Vector2(width, height); @@ -356,6 +356,8 @@ void HandlePipeAnimation() { return; } + UpdateHitbox(); + PipeManager pe = controller.pipeEntering; body.isKinematic = true; @@ -368,9 +370,8 @@ void HandlePipeAnimation() { Vector2 offset = controller.pipeDirection * (pipeDuration / 2f); if (pe.otherPipe.bottom) { - offset -= controller.pipeDirection; - float size = mainHitbox.size.y * transform.localScale.y; - offset.y -= size; + float size = controller.MainHitbox.size.y * transform.localScale.y; + offset.y += size; } transform.position = body.position = new Vector3(pe.otherPipe.transform.position.x, pe.otherPipe.transform.position.y, 1) - (Vector3) offset; photonView.RPC("PlaySound", RpcTarget.All, Enums.Sounds.Player_Sound_Powerdown); diff --git a/Assets/Scripts/Entity/Player/PlayerController.cs b/Assets/Scripts/Entity/Player/PlayerController.cs index fff822cfd4..7598054f6a 100644 --- a/Assets/Scripts/Entity/Player/PlayerController.cs +++ b/Assets/Scripts/Entity/Player/PlayerController.cs @@ -76,7 +76,7 @@ public class PlayerController : MonoBehaviourPun, IFreezableEntity, ICustomSeria bool IFreezableEntity.IsCarryable => true; bool IFreezableEntity.IsFlying => flying || propeller; - BoxCollider2D MainHitbox => hitboxes[0]; + public BoxCollider2D MainHitbox => hitboxes[0]; #region -- SERIALIZATION / EVENTS -- private static readonly float EPSILON = 0.2f, RESEND_RATE = 0.5f; @@ -1710,7 +1710,7 @@ bool ForceCrouchCheck() { //bool triggerState = Physics2D.queriesHitTriggers; //Physics2D.queriesHitTriggers = false; - bool ret = Physics2D.BoxCast(body.position + Vector2.up * 0.025f, new(width + 0.05f, 0.05f), 0, Vector2.up, MainHitbox.size.y * 1.7f, ONLY_GROUND_MASK); + bool ret = Physics2D.BoxCast(body.position + Vector2.up * 0.025f, new(width + 0.05f, 0.05f), 0, Vector2.up, MainHitbox.size.y * 2f, ONLY_GROUND_MASK); //Physics2D.queriesHitTriggers = triggerState; return ret; diff --git a/Assets/Scripts/Networking/UpdateChecker.cs b/Assets/Scripts/Networking/UpdateChecker.cs index 212ad5458d..31b8952f14 100644 --- a/Assets/Scripts/Networking/UpdateChecker.cs +++ b/Assets/Scripts/Networking/UpdateChecker.cs @@ -25,9 +25,10 @@ public async static void IsUpToDate(Action callback) { if (response.StatusCode != HttpStatusCode.OK) return; - bool ret; try { + bool ret = false; + //get the latest release version number from github string json = new StreamReader(response.GetResponseStream()).ReadToEnd(); JObject data = JObject.Parse(json); @@ -57,11 +58,7 @@ public async static void IsUpToDate(Action callback) { ret = local > remote; } - ret = true; - callback(ret, tag); - } catch { - ret = false; - } + } catch { } } } diff --git a/Assets/Scripts/UI/Menu/MainMenuManager.cs b/Assets/Scripts/UI/Menu/MainMenuManager.cs index f6b5bca696..15586d73bf 100644 --- a/Assets/Scripts/UI/Menu/MainMenuManager.cs +++ b/Assets/Scripts/UI/Menu/MainMenuManager.cs @@ -455,14 +455,14 @@ public void Start() { #else if (!GlobalController.Instance.checkedForVersion) { UpdateChecker.IsUpToDate((upToDate, latestVersion) => { - if (upToDate) return; + Debug.Log("a"); + updateText.text = $"An update is available:\n\nNew Version: {latestVersion}\nCurrent Version: {Application.version}"; updateBox.SetActive(true); EventSystem.current.SetSelectedGameObject(updateBoxSelected); - }); GlobalController.Instance.checkedForVersion = true; } @@ -694,6 +694,14 @@ public void OpenErrorBox(string text) { sfx.PlayOneShot(Enums.Sounds.UI_Error.GetClip()); } + public void BackSound() { + sfx.PlayOneShot(Enums.Sounds.UI_Back.GetClip()); + } + + public void ConfirmSound() { + sfx.PlayOneShot(Enums.Sounds.UI_Decide.GetClip()); + } + public void ConnectToDropdownRegion() { Region targetRegion = pingSortedRegions[region.value]; if (lastRegion == targetRegion.Code) @@ -1024,7 +1032,7 @@ private void RunCommand(string[] args) { string targetId = target?.UserId; if (targetId == null && (targetId = pairs.FirstOrDefault(nip => nip.name.ToLower() == strTarget)?.userId) == null) { - LocalChatMessage($"Unknown player {args[2]}", ColorToVector(Color.red)); + LocalChatMessage($"Unknown player {args[1]}", ColorToVector(Color.red)); return; } if (targetId == PhotonNetwork.LocalPlayer.UserId) { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 110b869da7..3ad8d10103 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -159,6 +159,11 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -824,7 +829,8 @@ PlayerSettings: tvOS: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Standalone: 0 il2cppCompilerConfiguration: {} il2cppCodeGeneration: WebGL: 1