Merge remote-tracking branch 'origin/main' into work_branch
# Conflicts: # Packages/manifest.json
This commit is contained in:
@@ -5549,6 +5549,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Features.Mainmenu::Darkmatter.Features.Mainmenu.MainmenuView
|
||||
playBtn: {fileID: 944146709}
|
||||
playBtnParticle: {fileID: 247050072}
|
||||
playBtnAnimator: {fileID: 944146712}
|
||||
mascotSkeletonGraphic: {fileID: 1313981500}
|
||||
jumpAnimation: jump
|
||||
idleAnimation: Idle
|
||||
|
||||
Reference in New Issue
Block a user