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
This commit is contained in:
Mausham
2026-06-07 15:53:45 +05:45
parent e3f047de2b d406f41acc
commit ec4288e97a
259 changed files with 15876 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Darkmatter/Content/Colorbook UI/Prefabs/.DS_Store vendored Normal file
View File

Binary file not shown.

20
Assets/Darkmatter/Content/Colorbook UI/Prefabs/DrawingPrefabs/Airplane Drawing.prefab
View File

@@ -330,15 +330,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.x
value: 0.24355799
value: 0.4092992
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.y
value: 0.24355799
value: 0.4092992
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.z
value: 0.24355799
value: 0.4092992
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.x
@@ -370,11 +370,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.x
value: -381.463
value: -404.24997
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 20.077026
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -562,15 +562,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.x
value: 0.24355799
value: 0.4092992
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.y
value: 0.24355799
value: 0.4092992
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.z
value: 0.24355799
value: 0.4092992
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.x
@@ -602,11 +602,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.x
value: -204.58456
value: -107
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 20.077026
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

16
Assets/Darkmatter/Content/Colorbook UI/Prefabs/SlotMarkers/Recatngle.prefab
View File

@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 501846013816502432}
- component: {fileID: 8665832532240036901}
- component: {fileID: 8513459380562180911}
- component: {fileID: 7638529631096518376}
m_Layer: 5
m_Name: Recatngle
m_TagString: Untagged
@@ -90,3 +91,18 @@ MonoBehaviour:
m_EditorClassIdentifier: Features.ShapeBuilder::Darkmatter.Features.ShapeBuilder.UI.SlotMarker
shape: {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
outline: {fileID: 0}
--- !u!114 &7638529631096518376
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4279528263583881541}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Outline
m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
m_EffectDistance: {x: 2.5, y: -2.5}
m_UseGraphicAlpha: 1

BIN
Assets/Darkmatter/Content/Colorbook UI/Prefabs/UI/.DS_Store vendored Normal file
View File

Binary file not shown.

1079
Assets/Darkmatter/Content/Colorbook UI/Prefabs/UI/SaveGalleryOverlay.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Darkmatter/Content/Colorbook UI/Prefabs/UI/SaveGalleryOverlay.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f9a026758de8463bb1416c9a09c38c11
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

59
Assets/Darkmatter/Content/Colorbook UI/Prefabs/UI/TutorialOverlayCanvas.prefab
View File

@@ -75,8 +75,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
@@ -98,8 +98,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
@@ -127,8 +127,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 97ce2c486cc8541d1ab1d83fda7f8eda, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
overlayView: {fileID: 100106}
config: {fileID: 11400000, guid: 71357eb1222bb4151ab4e5697a1decd3, type: 2}
--- !u!1 &100110
@@ -182,8 +182,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4ecf127118699405ebcd0e0712d7373d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
canvas: {fileID: 100102}
rootGroup: {fileID: 100105}
cutout: {fileID: 100204}
@@ -198,6 +198,9 @@ MonoBehaviour:
haloPulseScale: 1.18
pulseDuration: 0.6
dragHandDuration: 1.1
dragHandTipOffset: {x: 0, y: 70}
dragBubbleAtTop: 1
dragBubbleEdgeMargin: 150
--- !u!225 &6008915593776814208
CanvasGroup:
m_ObjectHideFlags: 0
@@ -266,8 +269,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.72}
m_RaycastTarget: 1
@@ -296,8 +299,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 29c836b3d2ed343e6a810f6e7548f487, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
cutoutShader: {fileID: 4800000, guid: 57d1ed1c62afa45db97a7c8e9ace795c, type: 3}
dimImage: {fileID: 100203}
--- !u!1 &100600
@@ -352,11 +355,11 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 100600}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.9}
m_RaycastTarget: 0
@@ -410,7 +413,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 130, y: 130}
m_SizeDelta: {x: 200, y: 200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &100702
CanvasRenderer:
@@ -430,8 +433,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
@@ -465,7 +468,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &100801
RectTransform:
m_ObjectHideFlags: 0
@@ -524,7 +527,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: 91}
m_SizeDelta: {x: -235, y: 91}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &100902
CanvasRenderer:
@@ -544,8 +547,8 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.96}
m_RaycastTarget: 0
@@ -574,7 +577,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.ContentSizeFitter
m_HorizontalFit: 2
m_VerticalFit: 0
@@ -588,7 +591,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.VerticalLayoutGroup
m_Padding:
m_Left: 100
@@ -639,8 +642,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: 463.445, y: -95.50001}
m_SizeDelta: {x: 0, y: 0}
m_AnchoredPosition: {x: 207.45999, y: -95.50001}
m_SizeDelta: {x: 214.92, y: 72.61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &101002
CanvasRenderer:
@@ -660,7 +663,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_Name:
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -752,7 +755,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3e37e2b5f1962004c8f10779a2fcf23a, type: 3}
m_Name:
m_Name:
m_EditorClassIdentifier: uLayout::Poke.UI.LayoutText
m_log: 0
m_ignoreLayout: 0

804
Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF Blue Outline.asset
View File

File diff suppressed because one or more lines are too long

226
Assets/Darkmatter/Content/Fonts/static/Fredoka-Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

2915
Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Darkmatter/Content/Sprites/World/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
Assets/Darkmatter/Content/Sprites/World/Ask Coins Sprites/.DS_Store vendored Normal file
View File

Binary file not shown.

BIN
Assets/Darkmatter/Content/Sprites/World/Ask Coins Sprites/Speech Bubble.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 22 KiB

2
Assets/Darkmatter/Content/Sprites/World/Ask Coins Sprites/Speech Bubble.png.meta
View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 270, y: 191, z: 255, w: 110}
spriteBorder: {x: 741, y: 322, z: 925, w: 337}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1