savya/Colorbook
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
This commit is contained in:
Mausham
2026-06-01 18:04:29 +05:45
parent 1641ed6b3c 4976bf14ca
commit abc3df086d
386 changed files with 36744 additions and 6992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Darkmatter/Data/Drawings/Palettes/DefaultPalette.asset
View File

@@ -22,7 +22,7 @@ MonoBehaviour:
- {r: 1, g: 1, b: 1, a: 1}
- {r: 0.05724919, g: 1, b: 0, a: 1}
- {r: 0, g: 0, b: 0, a: 1}
- {r: 0, g: 0.6845894, b: 1, a: 1}
- {r: 0, g: 0.9229766, b: 0.9622642, a: 1}
- {r: 1, g: 0, b: 0.7162385, a: 1}
- {r: 0.3857726, g: 0, b: 1, a: 1}
- {r: 0.5188679, g: 0.38189316, b: 0.30593628, a: 1}

16
Assets/Darkmatter/Data/Drawings/Templates/Ball.asset
View File

@@ -14,13 +14,25 @@ MonoBehaviour:
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
id: Ball
displayName: Ball
defaultThumbnail: {fileID: 21300000, guid: c79f0374ffc23654fa0c341985d7e249, type: 3}
defaultThumbnail: {fileID: -1097588712, guid: 6d69a607d0df04148bf50bc6ef2d6fcc, type: 3}
drawingPrefab: {fileID: 3523649744351506124, guid: ed2c3db5a20de9643a04dca1c61ff246, type: 3}
coloringPrefab: {fileID: 6799536857748686187, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
completionAnimationPrefab: {fileID: 6152354576180930737, guid: 4ae77336fb29049ef91d839f601fca8a, type: 3}
pieces:
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
regions:
- RegionId: Ball
- RegionId: Ball_1
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: Ball_1__1
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: Ball_1__2
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: Ball_1__3
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: Ball_1__4
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: Ball_1__5
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: Ball_1__6
InitialColor: {r: 1, g: 1, b: 1, a: 1}
colorPaletteId: defaultPalette

5
Assets/Darkmatter/Data/Settings/ShapeBuilder/ShapeBuilderConfig.asset
View File

@@ -12,10 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 52d6fdba64cc3491880636e34ed593d0, type: 3}
m_Name: ShapeBuilderConfig
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.ShapeBuilder.ShapeBuilderConfig
snapRadius: 100
previewRadius: 200
snapRadius: 200
previewRadius: 300
snapDuration: 0.25
returnDuration: 0.25
dragScale: 1.15
previewCurve:
serializedVersion: 2
m_Curve: