Merge remote-tracking branch 'origin/work_branch' into savya
# Conflicts: # Assets/Darkmatter/Scenes/Colorbook.unity
This commit is contained in:
Savya Bikram Shah
@@ -25,3 +25,27 @@ MonoBehaviour:
|
||||
Volume: 1
|
||||
Pitch: 1
|
||||
Loop: 0
|
||||
- Id: 101
|
||||
Clip: {fileID: 8300000, guid: 9807a19b9f71ec648b75048cf115c2f6, type: 3}
|
||||
Channel: 0
|
||||
Volume: 1
|
||||
Pitch: 1
|
||||
Loop: 0
|
||||
- Id: 400
|
||||
Clip: {fileID: 8300000, guid: 362141a08f284ab41a740893a3ad15fb, type: 3}
|
||||
Channel: 0
|
||||
Volume: 1
|
||||
Pitch: 1
|
||||
Loop: 0
|
||||
- Id: 200
|
||||
Clip: {fileID: 8300000, guid: 92d9128629e9e7a45afd47f4eff2c461, type: 3}
|
||||
Channel: 0
|
||||
Volume: 1
|
||||
Pitch: 1
|
||||
Loop: 0
|
||||
- Id: 202
|
||||
Clip: {fileID: 8300000, guid: aaceea77d62bc4c18bab10f3b8d33d2f, type: 3}
|
||||
Channel: 0
|
||||
Volume: 1
|
||||
Pitch: 1
|
||||
Loop: 0
|
||||
|
||||
44
Assets/Darkmatter/Data/Drawings/Templates/Bus.asset
Normal file
44
Assets/Darkmatter/Data/Drawings/Templates/Bus.asset
Normal file
@@ -0,0 +1,44 @@
|
||||
%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: Bus
|
||||
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
|
||||
id: Bus
|
||||
displayName: Bus
|
||||
defaultThumbnail: {fileID: 21300000, guid: ea71e848b4204cf45b66769881407633, type: 3}
|
||||
drawingPrefab: {fileID: 5958588885977327045, guid: 99d1fc2dbd73d934586f425777074054, type: 3}
|
||||
coloringPrefab: {fileID: 7561951831860265998, guid: 39b61120601346945bcde283b8154efe, type: 3}
|
||||
completionAnimationPrefab: {fileID: 535806827240859352, guid: 8bb86c5c7fecc4beba3519ff75fcbe85, type: 3}
|
||||
pieces:
|
||||
- {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
regions:
|
||||
- RegionId: Body
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Tire
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Tire__1
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: headlight
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: BodyLine
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Window1
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Window2
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Window22
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Window3
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
colorPaletteId: defaultPalette
|
||||
8
Assets/Darkmatter/Data/Drawings/Templates/Bus.asset.meta
Normal file
8
Assets/Darkmatter/Data/Drawings/Templates/Bus.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6e36ba5d4763c694289c8ca75ee81449
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
29
Assets/Darkmatter/Data/Drawings/Templates/Donut.asset
Normal file
29
Assets/Darkmatter/Data/Drawings/Templates/Donut.asset
Normal file
@@ -0,0 +1,29 @@
|
||||
%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: Donut
|
||||
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
|
||||
id: Donut
|
||||
displayName: Donut
|
||||
defaultThumbnail: {fileID: -786678772, guid: 4cf3f806c042e374a8578e4de7b539f4, type: 3}
|
||||
drawingPrefab: {fileID: 7032823913612743370, guid: 3423ca2826a04e744b9fc304b2fd2d02, type: 3}
|
||||
coloringPrefab: {fileID: 3951261677170865858, guid: 01160fc615a51ed408d3666c6eb5f470, type: 3}
|
||||
completionAnimationPrefab: {fileID: 5354043800789811769, guid: c53ff4e84335c4ffdb5ecffa0cc57ded, type: 3}
|
||||
pieces:
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
regions:
|
||||
- RegionId: DonutUpper
|
||||
InitialColor: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1}
|
||||
- RegionId: DonutLower
|
||||
InitialColor: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1}
|
||||
colorPaletteId: defaultPalette
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 14477b5d35d0be9439ecb935f1c4e64e
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
45
Assets/Darkmatter/Data/Drawings/Templates/Elephant.asset
Normal file
45
Assets/Darkmatter/Data/Drawings/Templates/Elephant.asset
Normal file
@@ -0,0 +1,45 @@
|
||||
%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: Elephant
|
||||
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
|
||||
id: Elephant
|
||||
displayName: Elephant
|
||||
defaultThumbnail: {fileID: 989389395, guid: 58e4ea2548d92004dba2f697d226ee47, type: 3}
|
||||
drawingPrefab: {fileID: 742296842112915006, guid: 72fb2132f9c2db84a9f69e0987881b4d, type: 3}
|
||||
coloringPrefab: {fileID: 6410834243504673730, guid: a8185c6e543861a4eb789c869a15b5fe, type: 3}
|
||||
completionAnimationPrefab: {fileID: 9101710484796646229, guid: bef15a989f7ed4ab1b568b91c7e699e9, type: 3}
|
||||
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: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: acfdb9428bcd74a85bade833220add1c, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
- {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
regions:
|
||||
- RegionId: Body
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Teeth1
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Teeth2
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Tail1
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Tail2
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
colorPaletteId: defaultPalette
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 62ae112e11b695a40b889d773a36f8bd
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
43
Assets/Darkmatter/Data/Drawings/Templates/Fish.asset
Normal file
43
Assets/Darkmatter/Data/Drawings/Templates/Fish.asset
Normal file
@@ -0,0 +1,43 @@
|
||||
%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: Fish
|
||||
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
|
||||
id: Fish
|
||||
displayName: Fish
|
||||
defaultThumbnail: {fileID: 1199372990, guid: 675fb0deddcf94547882d4418ccf0aa3, type: 3}
|
||||
drawingPrefab: {fileID: 830151417515138702, guid: 0d54e126357cbb740bf370f1c7e70e50, type: 3}
|
||||
coloringPrefab: {fileID: 6558705316041450001, guid: 8665107ae6cda374e86672d142c3179b, type: 3}
|
||||
completionAnimationPrefab: {fileID: 1326439346293965474, guid: f417cfff1c353433a9f749bdd044996d, type: 3}
|
||||
pieces:
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: 0caa62d6f271c4acb8a09a75ebcc708b, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
regions:
|
||||
- RegionId: Head
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Body
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Eyes
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Tail
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Fins1
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Fins2
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Fins3
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
colorPaletteId: defaultPalette
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4474b93704045a740ba9b8114e8a5238
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
52
Assets/Darkmatter/Data/Drawings/Templates/Frog.asset
Normal file
52
Assets/Darkmatter/Data/Drawings/Templates/Frog.asset
Normal file
@@ -0,0 +1,52 @@
|
||||
%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: Frog
|
||||
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
|
||||
id: Frog
|
||||
displayName: Frog
|
||||
defaultThumbnail: {fileID: 1535771922, guid: a3db467a5cc22b647ade2e7c43802702, type: 3}
|
||||
drawingPrefab: {fileID: 3594252390097820856, guid: 796accb4ed1c1284986a77b73a5e4b06, type: 3}
|
||||
coloringPrefab: {fileID: 4940528403607588797, guid: 1c5c7b9cf2cccf342b6fd892679e0087, type: 3}
|
||||
completionAnimationPrefab: {fileID: 7626734826293769917, guid: 3d1e956cb52394a6dada29426c918db8, type: 3}
|
||||
pieces:
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
- {fileID: 11400000, guid: acfdb9428bcd74a85bade833220add1c, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: 888b6a7cd3cae42099e8793f2e486dfd, type: 2}
|
||||
- {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
|
||||
- {fileID: 11400000, guid: 4a67406eb6fe043628d2b6a4e0c970ba, type: 2}
|
||||
- {fileID: 11400000, guid: 5cf3e58088f124445b00423cf68c01aa, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
|
||||
regions:
|
||||
- RegionId: Head
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Face
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Body
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Tongue
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Mouth
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Leg1
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Leg2
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Hand1
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- RegionId: Hand2
|
||||
InitialColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
colorPaletteId: defaultPalette
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f3200c6715fea4a41bc71c0314b519cd
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user