diff --git a/Assets/Resources/Fonts/UISymbols.asset b/Assets/Resources/Fonts/UISymbols.asset index 17f0e01c55..36fd65e8d8 100644 --- a/Assets/Resources/Fonts/UISymbols.asset +++ b/Assets/Resources/Fonts/UISymbols.asset @@ -532,9 +532,9 @@ MonoBehaviour: m_Metrics: m_Width: 13 m_Height: 13 - m_HorizontalBearingX: -2 + m_HorizontalBearingX: 0 m_HorizontalBearingY: 13 - m_HorizontalAdvance: 17 + m_HorizontalAdvance: 12 m_GlyphRect: m_X: 78 m_Y: 56 diff --git a/Assets/Resources/Prefabs/Powerup/IceFlower.prefab b/Assets/Resources/Prefabs/Powerup/IceFlower.prefab index 73e64f4c1d..f4115aa311 100644 --- a/Assets/Resources/Prefabs/Powerup/IceFlower.prefab +++ b/Assets/Resources/Prefabs/Powerup/IceFlower.prefab @@ -116,7 +116,6 @@ MonoBehaviour: bouncePower: 0 terminalVelocity: 8 blinkingRate: 6 - passthrough: 1 avoidPlayers: 0 followMe: {fileID: 0} followMeCounter: 0 diff --git a/Assets/Resources/Prefabs/Static/CloudPlatform.prefab b/Assets/Resources/Prefabs/Static/CloudPlatform.prefab index e557f44118..9090a060c5 100644 --- a/Assets/Resources/Prefabs/Static/CloudPlatform.prefab +++ b/Assets/Resources/Prefabs/Static/CloudPlatform.prefab @@ -28,7 +28,7 @@ Transform: m_GameObject: {fileID: 8010249587145537848} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2.2, y: 1, z: 0} - m_LocalScale: {x: 1.44, y: 0.94031227, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8010249587262149990} diff --git a/Assets/Scenes/Levels/DefaultCastle.unity b/Assets/Scenes/Levels/DefaultCastle.unity index a83c51464a..dfad4ad21c 100644 --- a/Assets/Scenes/Levels/DefaultCastle.unity +++ b/Assets/Scenes/Levels/DefaultCastle.unity @@ -3939,7 +3939,7 @@ GameObject: - component: {fileID: 361225205} m_Layer: 8 m_Name: Tilemap_Squishy - m_TagString: Untagged + m_TagString: Squishy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -4181,7 +4181,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 6 - m_TileSpriteIndex: 10 + m_TileSpriteIndex: 6 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -11268,8 +11268,9 @@ Tilemap: - m_RefCount: 56 m_Data: {fileID: -4555241164079809555, guid: 437a8c91bf200d54b838bc8c861ba57c, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 8220105646016656977, guid: 437a8c91bf200d54b838bc8c861ba57c, + type: 3} - m_RefCount: 1 m_Data: {fileID: 2755618445371018580, guid: 437a8c91bf200d54b838bc8c861ba57c, type: 3} @@ -11279,7 +11280,7 @@ Tilemap: - m_RefCount: 504 m_Data: {fileID: -5379535959924532667, guid: 437a8c91bf200d54b838bc8c861ba57c, type: 3} - - m_RefCount: 48 + - m_RefCount: 47 m_Data: {fileID: 9027231124237481164, guid: 437a8c91bf200d54b838bc8c861ba57c, type: 3} - m_RefCount: 5 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index d4f1bb03b8..d0d90f1c5d 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} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.25337464} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2429,8 +2429,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: 129.99997, y: -256} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -256} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75133766 MonoBehaviour: @@ -2568,8 +2568,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: 129.99997, y: -286} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -286} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &75580657 MonoBehaviour: @@ -2703,8 +2703,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: 129.99997, y: -15} - m_SizeDelta: {x: 259.99994, y: 22} + m_AnchoredPosition: {x: 130, y: -15} + m_SizeDelta: {x: 260, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &80074248 MonoBehaviour: @@ -3179,7 +3179,7 @@ MonoBehaviour: m_Calls: [] m_text: "\nGame by:\nipodtouch0218\n\nGithub Contributors\nGradedWarrior\nTheMoogle\nSkillz\nSkarph\nZest\nkittenchilly\nAmy54Desu\nKraken\n\nAdditional - Level Design\nSkarph\nTheCyVap\nmindnomad\n\nQA Testing\nShadow_Walker13\n\nOriginal + Level Design\nSkarph\nTheCyVap\nmindnomad\n\nQA Testing\nShadow_Walker13\nTheCyVap\n\nOriginal Game / Resources:\nNew Super Mario Bros.\nNew Super Mario Bros. Wii\nSuper Mario Maker 2\n(c) Nintendo\n\nRippers:\nDemon2Warrior (Background)\r\nVentureSonic (Background)\r\nPoudink (Tiles)\r\nSomeone (Tiles)\r\nHiccup @@ -3969,8 +3969,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: 129.99997, y: -149} - m_SizeDelta: {x: 259.99994, y: 22} + m_AnchoredPosition: {x: 130, y: -149} + m_SizeDelta: {x: 260, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &153817299 MonoBehaviour: @@ -6818,8 +6818,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: 129.99997, y: -166} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -166} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &256353508 MonoBehaviour: @@ -10054,8 +10054,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: 129.99997, y: -387} - m_SizeDelta: {x: 259.99994, y: 22} + m_AnchoredPosition: {x: 130, y: -387} + m_SizeDelta: {x: 260, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &402645375 MonoBehaviour: @@ -11356,8 +11356,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: 129.99997, y: -62} - m_SizeDelta: {x: 259.99994, y: 40} + m_AnchoredPosition: {x: 130, y: -62} + m_SizeDelta: {x: 260, y: 40} m_Pivot: {x: 0.5, y: 1} --- !u!114 &438218786 MonoBehaviour: @@ -12427,7 +12427,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: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -12756,8 +12756,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: 129.99997, y: -32} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -32} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &485322299 MonoBehaviour: @@ -20276,8 +20276,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: 129.99997, y: -108} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -108} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &644584041 MonoBehaviour: @@ -23540,8 +23540,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: 129.99997, y: -226} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -226} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &745954561 MonoBehaviour: @@ -23766,6 +23766,171 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!43 &758359380 +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 &762719174 GameObject: m_ObjectHideFlags: 0 @@ -25672,7 +25837,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: 0} + m_SizeDelta: {x: -40, y: 117.565796} m_Pivot: {x: 0, y: 1} --- !u!114 &823064027 MonoBehaviour: @@ -32737,8 +32902,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: 129.99997, y: -346} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -346} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &899502179 MonoBehaviour: @@ -33872,171 +34037,6 @@ 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 @@ -34509,7 +34509,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: 24, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -37209,7 +37209,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 938117286} m_HandleRect: {fileID: 938117285} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -38207,7 +38207,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: 20, y: 20.000027} m_Pivot: {x: 0.5, y: 0.5} @@ -40761,8 +40761,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: 129.99997, y: -434} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -434} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1259822364 MonoBehaviour: @@ -41712,9 +41712,9 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 2 m_Colors: - m_NormalColor: {r: 0.6117647, g: 0.6117647, b: 0.6117647, a: 1} + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 1, g: 1, b: 1, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -41722,10 +41722,13 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} + m_HighlightedSprite: {fileID: 1303659493, guid: 919785a51397c1a44816e9462ed989f9, + type: 3} + m_PressedSprite: {fileID: 995382058, guid: 919785a51397c1a44816e9462ed989f9, type: 3} + m_SelectedSprite: {fileID: 1303659493, guid: 919785a51397c1a44816e9462ed989f9, + type: 3} + m_DisabledSprite: {fileID: 1291356150, guid: 919785a51397c1a44816e9462ed989f9, + type: 3} m_AnimationTriggers: m_NormalTrigger: Normal m_HighlightedTrigger: Highlighted @@ -42008,7 +42011,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 925108426} + objectReference: {fileID: 758359380} - target: {fileID: 2500780753419200967, guid: 2dd296828f2080541ab2b41eeda650a7, type: 3} propertyPath: height @@ -42524,9 +42527,9 @@ RectTransform: m_Father: {fileID: 1657549222} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 299.99994, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 520, y: 51.4} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1305885201 @@ -43019,7 +43022,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1325357896 RectTransform: m_ObjectHideFlags: 0 @@ -43044,7 +43047,271 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 1, y: 1} ---- !u!43 &1325434615 +--- !u!1 &1328916951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1328916952} + - component: {fileID: 1328916956} + - component: {fileID: 1328916955} + - component: {fileID: 1328916954} + - component: {fileID: 1328916953} + m_Layer: 5 + m_Name: ControlsBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1328916952 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328916951} + 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: 1725641818} + m_Father: {fileID: 536087968} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.3, y: 0.17} + m_AnchorMax: {x: 0.7, y: 0.235} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1328916953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328916951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 566761500} + m_TargetAssemblyTypeName: UnityEngine.EventSystems.EventSystem, UnityEngine.UI + m_MethodName: SetSelectedGameObject + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 1328916951} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1328916954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328916951} + 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: -1008673158, guid: 919785a51397c1a44816e9462ed989f9, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 0.75 +--- !u!114 &1328916955 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328916951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 2 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 448507887} + m_SelectOnDown: {fileID: 448507887} + m_SelectOnLeft: {fileID: 1181212335} + m_SelectOnRight: {fileID: 1181212335} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.6, g: 0.6, b: 0.6, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0 + m_SpriteState: + m_HighlightedSprite: {fileID: -634966080, guid: 919785a51397c1a44816e9462ed989f9, + type: 3} + m_PressedSprite: {fileID: 1292347602, guid: 919785a51397c1a44816e9462ed989f9, + type: 3} + m_SelectedSprite: {fileID: -634966080, guid: 919785a51397c1a44816e9462ed989f9, + type: 3} + m_DisabledSprite: {fileID: 918296707, guid: 919785a51397c1a44816e9462ed989f9, + type: 3} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1328916954} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 887693661} + m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp + m_MethodName: OpenControls + 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 + - 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 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1328916951} + m_CullTransparentMesh: 1 +--- !u!1 &1348144973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1348144974} + - component: {fileID: 1348144975} + m_Layer: 0 + m_Name: Foreground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1348144974 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1348144973} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -22.54, y: -1.19, z: 1} + m_LocalScale: {x: 3, y: 3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 787874419} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1348144975 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1348144973} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: -1679110163, guid: 43ab0f5c9dbc1514ead6fa7a1cb07f02, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 5.12, y: 1.27} + m_AdaptiveModeThreshold: 1 + m_SpriteTileMode: 1 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!43 &1352838548 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -43209,270 +43476,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &1328916951 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1328916952} - - component: {fileID: 1328916956} - - component: {fileID: 1328916955} - - component: {fileID: 1328916954} - - component: {fileID: 1328916953} - m_Layer: 5 - m_Name: ControlsBtn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1328916952 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328916951} - 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: 1725641818} - m_Father: {fileID: 536087968} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.3, y: 0.17} - m_AnchorMax: {x: 0.7, y: 0.235} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1328916953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328916951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 566761500} - m_TargetAssemblyTypeName: UnityEngine.EventSystems.EventSystem, UnityEngine.UI - m_MethodName: SetSelectedGameObject - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 1328916951} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1328916954 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328916951} - 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: -1008673158, guid: 919785a51397c1a44816e9462ed989f9, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 0.75 ---- !u!114 &1328916955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328916951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 2 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 448507887} - m_SelectOnDown: {fileID: 448507887} - m_SelectOnLeft: {fileID: 1181212335} - m_SelectOnRight: {fileID: 1181212335} - m_Transition: 2 - m_Colors: - m_NormalColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.6, g: 0.6, b: 0.6, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.6, g: 0.6, b: 0.6, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0 - m_SpriteState: - m_HighlightedSprite: {fileID: -634966080, guid: 919785a51397c1a44816e9462ed989f9, - type: 3} - m_PressedSprite: {fileID: 1292347602, guid: 919785a51397c1a44816e9462ed989f9, - type: 3} - m_SelectedSprite: {fileID: -634966080, guid: 919785a51397c1a44816e9462ed989f9, - type: 3} - m_DisabledSprite: {fileID: 918296707, guid: 919785a51397c1a44816e9462ed989f9, - type: 3} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1328916954} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 887693661} - m_TargetAssemblyTypeName: MainMenuManager, Assembly-CSharp - m_MethodName: OpenControls - 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 - - 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 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328916951} - m_CullTransparentMesh: 1 ---- !u!1 &1348144973 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1348144974} - - component: {fileID: 1348144975} - m_Layer: 0 - m_Name: Foreground - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1348144974 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1348144973} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -22.54, y: -1.19, z: 1} - m_LocalScale: {x: 3, y: 3, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 787874419} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1348144975 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1348144973} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -1 - m_Sprite: {fileID: -1679110163, guid: 43ab0f5c9dbc1514ead6fa7a1cb07f02, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 2 - m_Size: {x: 5.12, y: 1.27} - m_AdaptiveModeThreshold: 1 - m_SpriteTileMode: 1 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1353937465 GameObject: m_ObjectHideFlags: 0 @@ -44360,7 +44363,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -5, y: -8} + m_AnchoredPosition: {x: -5, y: -8.0000305} m_SizeDelta: {x: 24, y: -16} m_Pivot: {x: 1, y: 1} --- !u!114 &1365573558 @@ -44406,8 +44409,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 47220571} m_HandleRect: {fileID: 47220570} m_Direction: 2 - m_Value: 1.0000002 - m_Size: 0.74676716 + m_Value: 1 + m_Size: 0.74662536 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -47518,7 +47521,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -9.0000305, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 172, y: 12} m_Pivot: {x: 1, y: 1} --- !u!114 &1472937422 MonoBehaviour: @@ -47874,8 +47877,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: 129.99997, y: -196} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -196} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1488925096 MonoBehaviour: @@ -77110,8 +77113,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: 129.99997, y: -416} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -416} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1568520319 GameObject: @@ -78010,7 +78013,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -246, y: -137.96924} m_Pivot: {x: 0, y: 0} --- !u!114 &1603668786 MonoBehaviour: @@ -78630,7 +78633,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: 51.4} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1657549223 MonoBehaviour: @@ -79182,8 +79185,8 @@ RectTransform: m_Father: {fileID: 1378308995} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -80271,7 +80274,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1730034125 RectTransform: m_ObjectHideFlags: 0 @@ -81716,7 +81719,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1325434615} + objectReference: {fileID: 1352838548} - target: {fileID: 2500780753419200967, guid: 2dd296828f2080541ab2b41eeda650a7, type: 3} propertyPath: height @@ -82276,7 +82279,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1141870934} m_HandleRect: {fileID: 1141870933} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -90364,8 +90367,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: 129.99997, y: -316} - m_SizeDelta: {x: 259.99994, y: 24} + m_AnchoredPosition: {x: 130, y: -316} + m_SizeDelta: {x: 260, y: 24} m_Pivot: {x: 0.5, y: 1} --- !u!114 &2007433170 MonoBehaviour: diff --git a/Assets/Scripts/Entity/FireballMover.cs b/Assets/Scripts/Entity/FireballMover.cs index f8b4dbec39..f6c960b09f 100644 --- a/Assets/Scripts/Entity/FireballMover.cs +++ b/Assets/Scripts/Entity/FireballMover.cs @@ -15,7 +15,7 @@ void Start() { object[] data = photonView.InstantiationData; left = (bool) data[0]; - if (data.Length > 1) + if (data.Length > 1 && isIceball) speed += Mathf.Abs((float) data[1] / 3f); body.velocity = new Vector2(speed * (left ? -1 : 1), -speed); diff --git a/Assets/Scripts/Entity/Player/PlayerController.cs b/Assets/Scripts/Entity/Player/PlayerController.cs index 7598054f6a..a11cb12333 100644 --- a/Assets/Scripts/Entity/Player/PlayerController.cs +++ b/Assets/Scripts/Entity/Player/PlayerController.cs @@ -6,6 +6,7 @@ using Photon.Pun; using ExitGames.Client.Photon; using TMPro; +using UnityEngine.SceneManagement; public class PlayerController : MonoBehaviourPun, IFreezableEntity, ICustomSerializeView, IOnPhotonViewPreNetDestroy { @@ -721,7 +722,7 @@ private void ActivatePowerupAction() { if (Utils.IsTileSolidAtWorldLocation(pos)) { photonView.RPC("SpawnParticle", RpcTarget.All, $"Prefabs/Particle/{projectile}Wall", pos); } else { - PhotonNetwork.Instantiate($"Prefabs/{projectile}", pos, Quaternion.identity, 0, new object[] { !facingRight ^ animator.GetCurrentAnimatorStateInfo(0).IsName("turnaround") }); + PhotonNetwork.Instantiate($"Prefabs/{projectile}", pos, Quaternion.identity, 0, new object[] { !facingRight ^ animator.GetCurrentAnimatorStateInfo(0).IsName("turnaround"), body.velocity.x }); } photonView.RPC("PlaySound", RpcTarget.All, sound); @@ -1692,7 +1693,7 @@ void HandleCrouching(bool crouchInput) { return; } bool prevCrouchState = crouching || groundpound; - crouching = ((onGround && crouchInput && !groundpound) || (!onGround && crouchInput && crouching) || ForceCrouchCheck()) && !holding; + crouching = ((onGround && crouchInput && !groundpound) || (!onGround && crouchInput && crouching) || (crouching && ForceCrouchCheck())) && !holding; if (crouching && !prevCrouchState) { //crouch start sound photonView.RPC("PlaySound", RpcTarget.All, state == Enums.PowerupState.BlueShell ? Enums.Sounds.Powerup_BlueShell_Enter : Enums.Sounds.Player_Sound_Crouch); @@ -1700,19 +1701,19 @@ void HandleCrouching(bool crouchInput) { } bool ForceCrouchCheck() { - if (!(state == Enums.PowerupState.BlueShell && (crouching || groundpound || inShell) && !onGround)) + if (state == Enums.PowerupState.BlueShell && onGround && SceneManager.GetActiveScene().buildIndex != 4) return false; if (state <= Enums.PowerupState.MiniMushroom) return false; float width = MainHitbox.bounds.extents.x; - //bool triggerState = Physics2D.queriesHitTriggers; - //Physics2D.queriesHitTriggers = false; + 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 * 2f, ONLY_GROUND_MASK); + bool ret = Physics2D.BoxCast(body.position + Vector2.up * 0.1f, new(width - 0.05f, 0.05f), 0, Vector2.up, MainHitbox.size.y * 2f, ONLY_GROUND_MASK); - //Physics2D.queriesHitTriggers = triggerState; + Physics2D.queriesHitTriggers = triggerState; return ret; } @@ -1994,7 +1995,7 @@ bool HandleStuckInBlock() { Vector2 checkSize = MainHitbox.size * transform.lossyScale * new Vector2(1, 0.75f); Vector2 checkPos = transform.position + (Vector3) (Vector2.up * checkSize / 2f); - if (!Utils.IsAnyTileSolidBetweenWorldBox(checkPos, checkSize * 0.9f)) { + if (!Utils.IsAnyTileSolidBetweenWorldBox(checkPos, checkSize * 0.9f, false)) { stuckInBlock = false; return false; } @@ -2012,11 +2013,11 @@ bool HandleStuckInBlock() { bool orig = Physics2D.queriesStartInColliders; Physics2D.queriesStartInColliders = false; - var hitTop = Physics2D.BoxCast(body.position + (size.y + 0.5f) * Vector2.up, new(size.x, 0.01f), 0, Vector2.down, size.y + 0.5f, ONLY_GROUND_MASK); + var hitTop = Physics2D.BoxCast(body.position + (size.y + 0.75f) * Vector2.up, new(size.x, 0.01f), 0, Vector2.down, size.y + 0.75f, ONLY_GROUND_MASK); if (hitTop) { Vector2 newPoint = new(body.position.x, hitTop.point.y); - if (hitTop.point.y > body.position.y && hitTop.point.y < body.position.y + MainHitbox.size.y && !Utils.IsTileSolidAtWorldLocation(newPoint + Vector2.up * 0.25f)) { + if (hitTop.point.y > body.position.y && hitTop.point.y < body.position.y + (size.y + 0.35f) && !Utils.IsTileSolidAtWorldLocation(newPoint + Vector2.up * 0.25f)) { transform.position = body.position = newPoint; } else { var hitBottom = Physics2D.BoxCast(body.position, new(size.x, 0.01f), 0, Vector2.down, size.y, ONLY_GROUND_MASK); @@ -2461,10 +2462,11 @@ void HandleMovement(float delta) { } } - if (!inShell && !(sliding && Mathf.Abs(floorAngle) > slopeSlidingAngle * 2)) { + bool uphill = sliding && (floorAngle != 0 && Mathf.Sign(floorAngle) == Mathf.Sign(body.velocity.x)); + if (!inShell && !(sliding && Mathf.Abs(floorAngle) > slopeSlidingAngle * 2 && !uphill)) { bool abovemax = false; float invincibleSpeedBoost = invincible > 0 ? 1.5f : 1; - float uphillChange = (floorAngle != 0 && Mathf.Sign(floorAngle) == Mathf.Sign(body.velocity.x)) ? (1 - (Mathf.Abs(floorAngle) / 360f)) : 1; + float uphillChange = uphill ? (1 - (Mathf.Abs(floorAngle) / 360f)) : 1; float max; if (onGround) { max = functionallyRunning ? runningMaxSpeed * invincibleSpeedBoost : walkingMaxSpeed; diff --git a/Assets/Scripts/Entity/StarBouncer.cs b/Assets/Scripts/Entity/StarBouncer.cs index 0ab07b71a1..90672c5f20 100644 --- a/Assets/Scripts/Entity/StarBouncer.cs +++ b/Assets/Scripts/Entity/StarBouncer.cs @@ -18,8 +18,7 @@ public class StarBouncer : MonoBehaviourPun { private BoxCollider2D worldCollider; - private int? becomeCollectibleAt = null; - private bool alreadyCollectible, canBounce; + private bool collectable, canBounce; void Start() { body = GetComponent(); @@ -44,9 +43,6 @@ void Start() { left = direction <= 1; fast = direction == 0 || direction == 3; creator = (int) data[1]; - becomeCollectibleAt = (int) data[2]; - if (becomeCollectibleAt < PhotonNetwork.ServerTimestamp) - alreadyCollectible = true; body.velocity = new Vector2(moveSpeed * (left ? -1 : 1), deathBoostAmount); if ((bool) data[3]) { body.velocity += Vector2.up * 3; @@ -55,10 +51,9 @@ void Start() { worldCollider.enabled = true; } else { GetComponent().enabled = true; - alreadyCollectible = true; + collectable = true; body.isKinematic = true; body.velocity = Vector2.zero; - becomeCollectibleAt = PhotonNetwork.ServerTimestamp; GetComponent().enabled = false; if (GameManager.Instance.musicEnabled) @@ -97,7 +92,9 @@ void FixedUpdate() { return; body.velocity = new Vector2(moveSpeed * (left ? -1 : 1) * (fast ? 1.5f : 1f), body.velocity.y); + canBounce |= body.velocity.y < 0; + collectable |= body.velocity.y < 0; HandleCollision(); @@ -148,6 +145,6 @@ public void Turnaround(bool hitLeft) { } public bool IsCollectible() { - return becomeCollectibleAt == null || alreadyCollectible || PhotonNetwork.ServerTimestamp - becomeCollectibleAt > 0; + return collectable; } } diff --git a/Assets/Scripts/Networking/UpdateChecker.cs b/Assets/Scripts/Networking/UpdateChecker.cs index 31b8952f14..39f108b029 100644 --- a/Assets/Scripts/Networking/UpdateChecker.cs +++ b/Assets/Scripts/Networking/UpdateChecker.cs @@ -27,7 +27,7 @@ public async static void IsUpToDate(Action callback) { try { - bool ret = false; + bool ret = true; //get the latest release version number from github string json = new StreamReader(response.GetResponseStream()).ReadToEnd(); @@ -55,7 +55,7 @@ public async static void IsUpToDate(Action callback) { if (local == remote) continue; - ret = local > remote; + ret &= local >= remote; } callback(ret, tag); diff --git a/Assets/Scripts/UI/Menu/MainMenuManager.cs b/Assets/Scripts/UI/Menu/MainMenuManager.cs index 15586d73bf..46d186491a 100644 --- a/Assets/Scripts/UI/Menu/MainMenuManager.cs +++ b/Assets/Scripts/UI/Menu/MainMenuManager.cs @@ -688,10 +688,12 @@ public void OpenPrivatePrompt() { EventSystem.current.SetSelectedGameObject(privateSelected); } public void OpenErrorBox(string text) { + if (!errorBox.activeSelf) + sfx.PlayOneShot(Enums.Sounds.UI_Error.GetClip()); + errorBox.SetActive(true); errorText.text = text; EventSystem.current.SetSelectedGameObject(errorButton); - sfx.PlayOneShot(Enums.Sounds.UI_Error.GetClip()); } public void BackSound() { diff --git a/Assets/Scripts/UI/Menu/RoomIcon.cs b/Assets/Scripts/UI/Menu/RoomIcon.cs index cf1861c0eb..55c7733b53 100644 --- a/Assets/Scripts/UI/Menu/RoomIcon.cs +++ b/Assets/Scripts/UI/Menu/RoomIcon.cs @@ -30,18 +30,19 @@ public void UpdateUI(RoomInfo newRoom) { string symbols = ""; Utils.GetCustomProperty(Enums.NetRoomProperties.StarRequirement, out int stars, newRoom.CustomProperties); Utils.GetCustomProperty(Enums.NetRoomProperties.CoinRequirement, out int coins, newRoom.CustomProperties); - bool lives = ((int) prop[Enums.NetRoomProperties.Lives]) >= 1; + Utils.GetCustomProperty(Enums.NetRoomProperties.Lives, out int lives, newRoom.CustomProperties); bool powerups = (bool) prop[Enums.NetRoomProperties.NewPowerups]; bool time = ((int) prop[Enums.NetRoomProperties.Time]) >= 1; //bool password = ((string) prop[Enums.NetRoomProperties.Password]) != ""; - if (lives) - symbols += ""; if (powerups) symbols += ""; if (time) symbols += ""; + if (lives >= 1) + symbols += "" + Utils.GetSymbolString(lives.ToString(), Utils.smallSymbols); + symbols += "" + Utils.GetSymbolString(stars.ToString(), Utils.smallSymbols); symbols += "" + Utils.GetSymbolString(coins.ToString(), Utils.smallSymbols); //if (password) diff --git a/Assets/Scripts/Utils.cs b/Assets/Scripts/Utils.cs index fa0999f3b0..44e0b90e3f 100644 --- a/Assets/Scripts/Utils.cs +++ b/Assets/Scripts/Utils.cs @@ -107,13 +107,14 @@ private static Tile.ColliderType GetColliderType(Vector3Int tileLocation) { return Tile.ColliderType.None; } - public static bool IsTileSolidBetweenWorldBox(Vector3Int tileLocation, Vector2 worldLocation, Vector2 worldBox) { - Collider2D collision = Physics2D.OverlapPoint(worldLocation, LayerMask.GetMask("Ground")); - if (collision && !collision.isTrigger && !collision.CompareTag("Player")) - return true; + public static bool IsTileSolidBetweenWorldBox(Vector3Int tileLocation, Vector2 worldLocation, Vector2 worldBox, bool boxcast = true) { + if (boxcast) { + Collider2D collision = Physics2D.OverlapPoint(worldLocation, LayerMask.GetMask("Ground")); + if (collision && !collision.isTrigger && !collision.CompareTag("Player")) + return true; + } Vector2 ogWorldLocation = worldLocation; - Vector3Int ogTileLocation = tileLocation; while (GetTileAtTileLocation(tileLocation) is TileInteractionRelocator it) { worldLocation += (Vector2)(Vector3) it.offset * 0.5f; tileLocation += it.offset; @@ -337,7 +338,7 @@ static bool IsInside(List polygon, Vector2 p) { return (count % 2 == 1); // Same as (count%2 == 1) } - public static bool IsAnyTileSolidBetweenWorldBox(Vector2 checkPosition, Vector2 checkSize) { + public static bool IsAnyTileSolidBetweenWorldBox(Vector2 checkPosition, Vector2 checkSize, bool boxcast = true) { Vector3Int minPos = WorldToTilemapPosition(checkPosition - (checkSize / 2), wrap: false); Vector3Int size = WorldToTilemapPosition(checkPosition + (checkSize / 2), wrap: false) - minPos; @@ -347,7 +348,7 @@ public static bool IsAnyTileSolidBetweenWorldBox(Vector2 checkPosition, Vector2 Vector3Int tileLocation = new(minPos.x + x, minPos.y + y, 0); WrapTileLocation(ref tileLocation); - if (IsTileSolidBetweenWorldBox(tileLocation, checkPosition, checkSize)) + if (IsTileSolidBetweenWorldBox(tileLocation, checkPosition, checkSize, boxcast)) return true; } } diff --git a/Assets/Sprites/UI/ui.png b/Assets/Sprites/UI/ui.png index fa3c3ee558..f1f1bde1f2 100644 Binary files a/Assets/Sprites/UI/ui.png and b/Assets/Sprites/UI/ui.png differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3ad8d10103..bbd0ded090 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -137,7 +137,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.6.6.0-beta + bundleVersion: 1.6.6.1-beta preloadedAssets: - {fileID: 0} - {fileID: 0}