Skip to content

Commit

Permalink
v1.7.0.1-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
@ipodtouch0218
ipodtouch0218 committed Sep 2, 2022
1 parent fa8a571 commit 5af6d7e
Show file tree
Hide file tree
Showing 12 changed files with 144 additions and 156 deletions.
1 change: 1 addition & 0 deletions Assets/Resources/Prefabs/PlayerLuigi.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21470,6 +21470,7 @@ MonoBehaviour:
bounce: 0
crouching: 0
groundpound: 0
groundpoundLastFrame: 0
sliding: 0
knockback: 0
hitBlock: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Prefabs/Static/GameManager.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4007,7 +4007,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
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}
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Tilemaps/Tiles/Bonus/bonus_20.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ MonoBehaviour:
e33: 1
m_InstancedGameObject: {fileID: 0}
m_Flags: 1
m_ColliderType: 1
m_ColliderType: 2
208 changes: 104 additions & 104 deletions Assets/Scenes/Levels/CustomBonus.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4709,13 +4709,13 @@ CompositeCollider2D:
Y: -20000000
- X: -260000000
Y: -20000000
- - X: -115000000
- - X: 205000000
Y: -15000000
- X: -125000000
- X: 195000000
Y: -15000000
- X: -125000000
- X: 195000000
Y: -25000000
- X: -115000000
- X: 205000000
Y: -25000000
- - X: -30000000
Y: -15000000
Expand All @@ -4725,30 +4725,14 @@ CompositeCollider2D:
Y: -60000000
- X: -30000000
Y: -60000000
- - X: 205000000
- - X: -115000000
Y: -15000000
- X: 195000000
- X: -125000000
Y: -15000000
- X: 195000000
Y: -25000000
- X: 205000000
Y: -25000000
- - X: 60000000
Y: -25000000
- X: 45000000
Y: -25000000
- X: 45000000
Y: -30000000
- X: 60000000
Y: -30000000
- - X: 35000000
- X: -125000000
Y: -25000000
- X: 20000000
- X: -115000000
Y: -25000000
- X: 20000000
Y: -30000000
- X: 35000000
Y: -30000000
- - X: -205000000
Y: -25000000
- X: -215000000
Expand All @@ -4757,30 +4741,14 @@ CompositeCollider2D:
Y: -30000000
- X: -205000000
Y: -30000000
- - X: 140000000
Y: -55000000
- X: 175000000
Y: -55000000
- X: 175000000
Y: -60000000
- X: 180000000
Y: -60000000
- X: 180000000
Y: -40000000
- X: 175000000
Y: -40000000
- X: 175000000
Y: -45000000
- X: 140000000
Y: -45000000
- X: 140000000
- - X: -185000000
Y: -25000000
- X: 130000000
- X: -195000000
Y: -25000000
- X: 130000000
Y: -60000000
- X: 140000000
Y: -60000000
- X: -195000000
Y: -30000000
- X: -185000000
Y: -30000000
- - X: -10000000
Y: -55000000
- X: 30000000
Expand Down Expand Up @@ -4813,14 +4781,46 @@ CompositeCollider2D:
Y: -60000000
- X: -10000000
Y: -60000000
- - X: -185000000
- - X: 35000000
Y: -25000000
- X: -195000000
- X: 20000000
Y: -25000000
- X: -195000000
- X: 20000000
Y: -30000000
- X: -185000000
- X: 35000000
Y: -30000000
- - X: 60000000
Y: -25000000
- X: 45000000
Y: -25000000
- X: 45000000
Y: -30000000
- X: 60000000
Y: -30000000
- - X: 140000000
Y: -55000000
- X: 175000000
Y: -55000000
- X: 175000000
Y: -60000000
- X: 180000000
Y: -60000000
- X: 180000000
Y: -40000000
- X: 175000000
Y: -40000000
- X: 175000000
Y: -45000000
- X: 140000000
Y: -45000000
- X: 140000000
Y: -25000000
- X: 130000000
Y: -25000000
- X: 130000000
Y: -60000000
- X: 140000000
Y: -60000000
- - X: -95000000
Y: -55000000
- X: -60000000
Expand All @@ -4845,18 +4845,6 @@ CompositeCollider2D:
Y: -60000000
- X: -95000000
Y: -60000000
- - X: 270000000
Y: -30000000
- X: 260000000
Y: -30000000
- X: 260000000
Y: -35000000
- X: 250000000
Y: -35000000
- X: 250000000
Y: -42187500
- X: 270000000
Y: -42187500
- - X: 310000000
Y: -35000000
- X: 300000000
Expand All @@ -4869,6 +4857,18 @@ CompositeCollider2D:
Y: -42187500
- X: 310000000
Y: -42187500
- - X: 270000000
Y: -30000000
- X: 260000000
Y: -30000000
- X: 260000000
Y: -35000000
- X: 250000000
Y: -35000000
- X: 250000000
Y: -42187500
- X: 270000000
Y: -42187500
- - X: -140000000
Y: -40000000
- X: -145000000
Expand Down Expand Up @@ -4901,6 +4901,14 @@ CompositeCollider2D:
Y: -60000000
- X: -140000000
Y: -60000000
- - X: 210000000
Y: -40000000
- X: 190000000
Y: -40000000
- X: 190000000
Y: -60000000
- X: 210000000
Y: -60000000
- - X: 225000000
Y: -55000000
- X: 320000000
Expand All @@ -4917,14 +4925,6 @@ CompositeCollider2D:
Y: -60000000
- X: 225000000
Y: -60000000
- - X: 210000000
Y: -40000000
- X: 190000000
Y: -40000000
- X: 190000000
Y: -60000000
- X: 210000000
Y: -60000000
- - X: 120000000
Y: -40000000
- X: 110000000
Expand Down Expand Up @@ -5003,30 +5003,26 @@ CompositeCollider2D:
- {x: -30, y: -1.5}
- {x: -30, y: -2}
- {x: -26, y: -2}
- - {x: -11.5, y: -1.5}
- {x: -12.5, y: -1.5}
- {x: -12.5, y: -2.5}
- {x: -11.5, y: -2.5}
- - {x: -3, y: -1.5}
- {x: -4, y: -1.5}
- {x: -4, y: -6}
- {x: -3, y: -6}
- - {x: 20.5, y: -1.5}
- {x: 19.5, y: -1.5}
- {x: 19.5, y: -2.5}
- {x: 20.5, y: -2.5}
- - {x: 6, y: -2.5}
- {x: 4.5, y: -2.5}
- {x: 4.5, y: -3}
- {x: 6, y: -3}
- - {x: 3.5, y: -2.5}
- {x: 2, y: -2.5}
- {x: 2, y: -3}
- {x: 3.5, y: -3}
- - {x: -3, y: -1.5}
- {x: -4, y: -1.5}
- {x: -4, y: -6}
- {x: -3, y: -6}
- - {x: -11.5, y: -1.5}
- {x: -12.5, y: -1.5}
- {x: -12.5, y: -2.5}
- {x: -11.5, y: -2.5}
- - {x: -20.5, y: -2.5}
- {x: -21.5, y: -2.5}
- {x: -21.5, y: -3}
- {x: -20.5, y: -3}
- - {x: -18.5, y: -2.5}
- {x: -19.5, y: -2.5}
- {x: -19.5, y: -3}
- {x: -18.5, y: -3}
- - {x: 14, y: -5.5}
- {x: 17.5, y: -5.5}
- {x: 17.5, y: -6}
Expand Down Expand Up @@ -5055,10 +5051,14 @@ CompositeCollider2D:
- {x: -2, y: -3}
- {x: -2, y: -6}
- {x: -1, y: -6}
- - {x: -18.5, y: -2.5}
- {x: -19.5, y: -2.5}
- {x: -19.5, y: -3}
- {x: -18.5, y: -3}
- - {x: 3.5, y: -2.5}
- {x: 2, y: -2.5}
- {x: 2, y: -3}
- {x: 3.5, y: -3}
- - {x: 6, y: -2.5}
- {x: 4.5, y: -2.5}
- {x: 4.5, y: -3}
- {x: 6, y: -3}
- - {x: -9.5, y: -5.5}
- {x: -6, y: -5.5}
- {x: -6, y: -6}
Expand All @@ -5071,18 +5071,18 @@ CompositeCollider2D:
- {x: -10, y: -4}
- {x: -10, y: -6}
- {x: -9.5, y: -6}
- - {x: 27, y: -3}
- {x: 26, y: -3}
- {x: 26, y: -3.5}
- {x: 25, y: -3.5}
- {x: 25, y: -4.21875}
- {x: 27, y: -4.21875}
- - {x: 31, y: -3.5}
- {x: 30, y: -3.5}
- {x: 30, y: -3}
- {x: 29, y: -3}
- {x: 29, y: -4.21875}
- {x: 31, y: -4.21875}
- - {x: 27, y: -3}
- {x: 26, y: -3}
- {x: 26, y: -3.5}
- {x: 25, y: -3.5}
- {x: 25, y: -4.21875}
- {x: 27, y: -4.21875}
- - {x: -14, y: -4}
- {x: -14.5, y: -4}
- {x: -14.5, y: -4.5}
Expand All @@ -5099,10 +5099,10 @@ CompositeCollider2D:
- {x: -14.5, y: -5.5}
- {x: -14.5, y: -6}
- {x: -14, y: -6}
- - {x: -11, y: -4}
- {x: -13, y: -4}
- {x: -13, y: -6}
- {x: -11, y: -6}
- - {x: 21, y: -4}
- {x: 19, y: -4}
- {x: 19, y: -6}
- {x: 21, y: -6}
- - {x: 22.5, y: -5.5}
- {x: 32, y: -5.5}
- {x: 32, y: -4.5}
Expand All @@ -5111,14 +5111,14 @@ CompositeCollider2D:
- {x: 22, y: -4}
- {x: 22, y: -6}
- {x: 22.5, y: -6}
- - {x: 21, y: -4}
- {x: 19, y: -4}
- {x: 19, y: -6}
- {x: 21, y: -6}
- - {x: 12, y: -4}
- {x: 11, y: -4}
- {x: 11, y: -6}
- {x: 12, y: -6}
- - {x: -11, y: -4}
- {x: -13, y: -4}
- {x: -13, y: -6}
- {x: -11, y: -6}
m_VertexDistance: 0.0005
m_OffsetDistance: 0
m_UseDelaunayMesh: 0
Expand Down
6 changes: 3 additions & 3 deletions Assets/Scenes/MainMenu.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3287,9 +3287,9 @@ MonoBehaviour:
Game / Resources</color>\nNew Super Mario Bros.\nNew Super Mario Bros. Wii\nSuper
Mario Maker 2\n(c) Nintendo\n\n<color=yellow>Asset Rippers</color>\nDemon2Warrior
(Background)\r\nVentureSonic (Background)\r\nKeira (Background)\nOhthatguy (Background)\nPoudink
(Tiles)\r\nSomeone (Tiles)\r\nHiccup (Tiles)\r\nJouv (Tiles)\r\nmindnomad (Tiles/Sound)\n\rSymbolcom
(Enemies)\r\nMr. C (Enemies)\r\nRagey (Enemies)\r\nTechokami (Enemies)\r\n\rA
Refracted Swindler (UI)\r\nTreeki (UI)\r\n\rDouble S (Models)\r\nKartMakerBrosU
(Tiles)\r\nSomeone (Tiles)\r\nHiccup (Tiles)\r\nJouv (Tiles)\r\nMr-SUGOI (Tiles)\nmindnomad
(Tiles/Sound)\n\rSymbolcom (Enemies)\r\nMr. C (Enemies)\r\nRagey (Enemies)\r\nTechokami
(Enemies)\r\n\rA Refracted Swindler (UI)\r\nTreeki (UI)\r\n\rDouble S (Models)\r\nKartMakerBrosU
(Models)\r\nTeridaxXD001 (Models)\r\nSkarph (Models/Sound)\r\nLukeWarnut (Sound)\r\nLuke
Hackett (Sound)\r\nmindnomad (Sound)\n "
m_isRightToLeft: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/DiscordController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void Update() {
}

public void OnDisable() {
discord.Dispose();
discord?.Dispose();
}

public void UpdateActivity() {
Expand Down
Loading

0 comments on commit 5af6d7e

Please sign in to comment.