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

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

Browse Source 
# Conflicts:
#	Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
This commit is contained in:
Savya Bikram Shah
2026-05-29 19:12:35 +05:45
parent 84689a6755 c6b06bb5ee
commit 9b2e4c915c
47 changed files with 6847 additions and 1566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
Assets/Darkmatter/Scenes/GamePlay.unity
View File

@@ -1806,7 +1806,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 4116787378023023922}
m_Father: {fileID: 153461769}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2232,9 +2233,9 @@ RectTransform:
- {fileID: 1982732272}
m_Father: {fileID: 153461769}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -1182.1761, y: -836.5969}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 505.82385, y: 200.40308}
m_SizeDelta: {x: 660.4729, y: 319.02832}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1310839950
@@ -3611,6 +3612,112 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!224 &4116787378023023922 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
m_PrefabInstance: {fileID: 4467542889302059353}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4467542889302059353
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1143672390}
m_Modifications:
- target: {fileID: 6799536857748686187, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_Name
value: BallColoring
objectReference: {fileID: 0}
- target: {fileID: 6799536857748686187, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7007843749351456914, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0