Merge remote-tracking branch 'origin/main' into savya

# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF Blue Outline.asset
This commit is contained in:
Savya Bikram Shah
2026-05-29 14:26:23 +05:45
101 changed files with 55726 additions and 520 deletions

View File

@@ -5170,6 +5170,16 @@ MonoBehaviour:
m_EditorClassIdentifier: Features.Artbook::Darkmatter.Features.Artbook.ArtbookView
backBtn: {fileID: 25370134}
colorbookBtn: {fileID: 754780123}
leftPageImage: {fileID: 833647405}
rightPageImage: {fileID: 59506833}
leftPageNameText: {fileID: 562371605}
rightPageNameText: {fileID: 269319724}
leftSaveBtn: {fileID: 1661684212}
rightSaveBtn: {fileID: 215032814}
leftEditBtn: {fileID: 353577148}
rightEditBtn: {fileID: 323995479}
leftArrowBtn: {fileID: 2138327621}
rightArrowBtn: {fileID: 1345816101}
--- !u!1 &2018366880
GameObject:
m_ObjectHideFlags: 0