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

# Conflicts: # Assets/Darkmatter/Content/Fonts/static/Fredoka-SemiBold SDF.asset
2026-05-29 19:12:35 +05:45
parent 84689a6755 c6b06bb5ee
commit 9b2e4c915c
47 changed files with 6847 additions and 1566 deletions
--- a/Assets/Darkmatter/Data/Drawings/Templates/Ball.asset
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Ball.asset
@@ -0,0 +1,26 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 712e4ea76c27b4cdaab50081d36d953a, type: 3}
+  m_Name: Ball
+  m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
+  id: Ball
+  displayName: Ball
+  defaultThumbnail: {fileID: 21300000, guid: c79f0374ffc23654fa0c341985d7e249, type: 3}
+  drawingPrefab: {fileID: 3523649744351506124, guid: ed2c3db5a20de9643a04dca1c61ff246, type: 3}
+  coloringPrefab: {fileID: 6799536857748686187, guid: e02814fe96e1cf84491b9545b5642307, type: 3}
+  completionAnimationPrefab: {fileID: 0}
+  pieces:
+  - {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
+  regions:
+  - RegionId: Ball
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  colorPaletteId: defaultPalette
--- a/Assets/Darkmatter/Data/Drawings/Templates/Ball.asset.meta
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Ball.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df588da411a3e08468106a8317fdbd1e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Darkmatter/Data/Drawings/Templates/Dog.asset
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Dog.asset
@@ -0,0 +1,40 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 712e4ea76c27b4cdaab50081d36d953a, type: 3}
+  m_Name: Dog
+  m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
+  id: Dog
+  displayName: Dog
+  defaultThumbnail: {fileID: 21300000, guid: bcb7278db61b3ac458a7d0937be95114, type: 3}
+  drawingPrefab: {fileID: 2095472511558828082, guid: fdaa71c7b745ae747a5cb2298b8457c6, type: 3}
+  coloringPrefab: {fileID: 5797023492298654107, guid: 0a159cbe2a2712c4fa2ae4df463a1af1, type: 3}
+  completionAnimationPrefab: {fileID: 0}
+  pieces:
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
+  - {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
+  - {fileID: 11400000, guid: 0caa62d6f271c4acb8a09a75ebcc708b, type: 2}
+  - {fileID: 11400000, guid: 0caa62d6f271c4acb8a09a75ebcc708b, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  regions:
+  - RegionId: Body
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Ear1
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Ear2
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  colorPaletteId: defaultPalette
--- a/Assets/Darkmatter/Data/Drawings/Templates/Dog.asset.meta
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Dog.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a2ef043d1d7051c47a68e2ebce7bd3dd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Darkmatter/Data/Drawings/Templates/Earphone.asset
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Earphone.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 712e4ea76c27b4cdaab50081d36d953a, type: 3}
+  m_Name: Earphone
+  m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
+  id: Earphone
+  displayName: Earphone
+  defaultThumbnail: {fileID: -174126971, guid: 788e2c50baa49594b82c67a97ec2f98d, type: 3}
+  drawingPrefab: {fileID: 6408485857370138169, guid: 582c4d58f3b3cb445abe162dc1fa2792, type: 3}
+  coloringPrefab: {fileID: 8794731807924147807, guid: 79087509e941a6d48ad227826bbeb307, type: 3}
+  completionAnimationPrefab: {fileID: 0}
+  pieces:
+  - {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 5cf3e58088f124445b00423cf68c01aa, type: 2}
+  - {fileID: 11400000, guid: 5cf3e58088f124445b00423cf68c01aa, type: 2}
+  regions:
+  - RegionId: Bar
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Bottom
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Body
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Head
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: EarBud
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  colorPaletteId: defaultPalette
--- a/Assets/Darkmatter/Data/Drawings/Templates/Earphone.asset.meta
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Earphone.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 01326847cbf6ead41ac519224a2381a7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Darkmatter/Data/Drawings/Templates/Envelop.asset
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Envelop.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 712e4ea76c27b4cdaab50081d36d953a, type: 3}
+  m_Name: Envelop
+  m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
+  id: Envelop
+  displayName: Envelop
+  defaultThumbnail: {fileID: -1212682616, guid: 62417922da5608742bec9efcc6e1edc8, type: 3}
+  drawingPrefab: {fileID: 1138263911558588856, guid: bc8b3e8f6a3e016459b0bf73af697f86, type: 3}
+  coloringPrefab: {fileID: 3274108684332002975, guid: 435e7cab757fe0743adb9b0e56047c84, type: 3}
+  completionAnimationPrefab: {fileID: 0}
+  pieces:
+  - {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  regions:
+  - RegionId: Top
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Top1
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Left
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Right
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  - RegionId: Bottom
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  colorPaletteId: defaultPalette
--- a/Assets/Darkmatter/Data/Drawings/Templates/Envelop.asset.meta
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Envelop.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc24a6d2802de5d4298d1da3d1415e97
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Darkmatter/Data/Drawings/Templates/Five.asset
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Five.asset
@@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 712e4ea76c27b4cdaab50081d36d953a, type: 3}
+  m_Name: Five
+  m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
+  id: Five
+  displayName: Five
+  defaultThumbnail: {fileID: 1218086232, guid: 8932e7598fa18214ba0faeb3d4c43330, type: 3}
+  drawingPrefab: {fileID: 8388886928725757613, guid: 03a73602b2a7a214fa8d84e4d6cdb0d9, type: 3}
+  coloringPrefab: {fileID: 8803008988544010490, guid: e0c005e2ebec2554db1f36405cea88a8, type: 3}
+  completionAnimationPrefab: {fileID: 0}
+  pieces:
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
+  - {fileID: 11400000, guid: 0caa62d6f271c4acb8a09a75ebcc708b, type: 2}
+  regions:
+  - RegionId: five
+    InitialColor: {r: 1, g: 1, b: 1, a: 1}
+  colorPaletteId: defaultPalette
--- a/Assets/Darkmatter/Data/Drawings/Templates/Five.asset.meta
+++ b/Assets/Darkmatter/Data/Drawings/Templates/Five.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2043f692673a79543afed5cb879f0e04
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: