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

fix

Browse Source
This commit is contained in:
Mausham
2026-06-25 11:23:34 +05:45
parent 93fafae63b
commit b9c9889145
35 changed files with 1354 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/AddressableAssetsData/AddressableAssetSettings.asset
View File

@@ -15,7 +15,8 @@ MonoBehaviour:
m_DefaultGroup: 0e030d5498bfe4ffd8443c796618c539
m_currentHash:
serializedVersion: 2
Hash: 0aab0a7031824c70554dc83def7114ca
Hash: 33d5127b858aa089058bcbcfda94e022
m_ExtractTypeTreeData: 0
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_CatalogRequestsTimeout: 0

6
Assets/AddressableAssetsData/AssetGroups/Drawing.asset
View File

@@ -63,6 +63,12 @@ MonoBehaviour:
m_SerializedLabels:
- drawing
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5f3b8273533c8514cbc5f46cf86f90e8
m_Address: Diyo
m_ReadOnly: 0
m_SerializedLabels:
- drawing
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 62ae112e11b695a40b889d773a36f8bd
m_Address: Elephant
m_ReadOnly: 0

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/2. diyo.png.meta
View File

@@ -24,7 +24,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

6
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo-1.png.meta
View File

@@ -33,7 +33,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
@@ -55,7 +55,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -213,7 +213,7 @@ TextureImporter:
customData:
physicsShape: []
bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo-2.png.meta
View File

@@ -24,7 +24,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo-3.png.meta
View File

@@ -24,7 +24,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo-4.png.meta
View File

@@ -24,7 +24,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo-5.png.meta
View File

@@ -27,7 +27,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo-6.png.meta
View File

@@ -27,7 +27,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo-7.png.meta
View File

@@ -24,7 +24,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

2
Assets/Darkmatter/Content/Colorbook UI/DrawingItems/1.NewItems/2. diyo/diyo.png.meta
View File

@@ -24,7 +24,7 @@ TextureImporter:
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
isReadable: 1
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0

12
Assets/Darkmatter/Content/Colorbook UI/Prefabs/ColoringPrefabs/DiyoColoring.prefab
View File

@@ -88,7 +88,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7667901d8aea645d28b5125a2ed546ce, type: 3}
m_Name:
m_EditorClassIdentifier: Features.Coloring::Darkmatter.Features.Coloring.UI.ColorRegionView
<RegionId>k__BackingField:
<RegionId>k__BackingField: ColoringPart__1
alphaHitThreshold: 0.5
--- !u!1 &191435270803162709
GameObject:
@@ -178,7 +178,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7667901d8aea645d28b5125a2ed546ce, type: 3}
m_Name:
m_EditorClassIdentifier: Features.Coloring::Darkmatter.Features.Coloring.UI.ColorRegionView
<RegionId>k__BackingField:
<RegionId>k__BackingField: ColoringPart__2
alphaHitThreshold: 0.5
--- !u!1 &2116797317990409869
GameObject:
@@ -319,7 +319,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7667901d8aea645d28b5125a2ed546ce, type: 3}
m_Name:
m_EditorClassIdentifier: Features.Coloring::Darkmatter.Features.Coloring.UI.ColorRegionView
<RegionId>k__BackingField:
<RegionId>k__BackingField: ColoringPart__4
alphaHitThreshold: 0.5
--- !u!1 &6166418032319624766
GameObject:
@@ -409,7 +409,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7667901d8aea645d28b5125a2ed546ce, type: 3}
m_Name:
m_EditorClassIdentifier: Features.Coloring::Darkmatter.Features.Coloring.UI.ColorRegionView
<RegionId>k__BackingField:
<RegionId>k__BackingField: ColoringPart__5
alphaHitThreshold: 0.5
--- !u!1 &6786397583683792170
GameObject:
@@ -499,7 +499,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7667901d8aea645d28b5125a2ed546ce, type: 3}
m_Name:
m_EditorClassIdentifier: Features.Coloring::Darkmatter.Features.Coloring.UI.ColorRegionView
<RegionId>k__BackingField:
<RegionId>k__BackingField: ColoringPart__3
alphaHitThreshold: 0.5
--- !u!1 &8064999957061396189
GameObject:
@@ -664,5 +664,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7667901d8aea645d28b5125a2ed546ce, type: 3}
m_Name:
m_EditorClassIdentifier: Features.Coloring::Darkmatter.Features.Coloring.UI.ColorRegionView
<RegionId>k__BackingField:
<RegionId>k__BackingField: ColoringPart
alphaHitThreshold: 0.5

582
Assets/Darkmatter/Content/Colorbook UI/Prefabs/DrawingPrefabs/DiyoDrawing.prefab Normal file
View File

@@ -0,0 +1,582 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3035742997546070093
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5432799010200441757}
- component: {fileID: 4617385421531984196}
- component: {fileID: 6022246172314397352}
m_Layer: 5
m_Name: Outline
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &5432799010200441757
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3035742997546070093}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 6346336572382360563}
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: -12, y: -29}
m_SizeDelta: {x: 649, y: 493}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4617385421531984196
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3035742997546070093}
m_CullTransparentMesh: 1
--- !u!114 &6022246172314397352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3035742997546070093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 4729411452928437888, guid: f65997704927984458b3ccd6b37e713a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4945602003854698950
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6346336572382360563}
- component: {fileID: 3128240708768417003}
m_Layer: 5
m_Name: DiyoDrawing
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6346336572382360563
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4945602003854698950}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 49955372140070849}
- {fileID: 8660149638183115518}
- {fileID: 6016488348690326039}
- {fileID: 522170117726343288}
- {fileID: 5432799010200441757}
m_Father: {fileID: 0}
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: 0, y: 0}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3128240708768417003
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4945602003854698950}
m_CullTransparentMesh: 1
--- !u!1001 &4973610812477907745
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6346336572382360563}
m_Modifications:
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_SizeDelta.x
value: 260.2072
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_SizeDelta.y
value: 75.1988
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalRotation.w
value: 0.83972985
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalRotation.z
value: 0.54300445
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 545.9999
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 253.00002
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 65.777
objectReference: {fileID: 0}
- target: {fileID: 8177199881523649195, guid: 483b170ade7354414929ed6252fa552e, type: 3}
propertyPath: m_Name
value: Oval
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 483b170ade7354414929ed6252fa552e, type: 3}
--- !u!224 &522170117726343288 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4772353642633016153, guid: 483b170ade7354414929ed6252fa552e, type: 3}
m_PrefabInstance: {fileID: 4973610812477907745}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5371806780531268125
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6346336572382360563}
m_Modifications:
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_SizeDelta.x
value: 578.68
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_SizeDelta.y
value: 344.6991
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.w
value: 0.8191521
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5735764
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.x
value: -82.321915
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 77.00008
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 70
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4388206011285020732, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_Name
value: Circle
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
--- !u!224 &8660149638183115518 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
m_PrefabInstance: {fileID: 5371806780531268125}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7051979229013910260
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6346336572382360563}
m_Modifications:
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_SizeDelta.x
value: 334.8798
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_SizeDelta.y
value: 199.4759
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.w
value: 0.8191521
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5735764
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.x
value: -82.321915
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_AnchoredPosition.y
value: 77.00008
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 70
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4388206011285020732, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
propertyPath: m_Name
value: Circle (1)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
--- !u!224 &6016488348690326039 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3648889831887995107, guid: ed3abc5b1c6bc43938850705ab3e4d4b, type: 3}
m_PrefabInstance: {fileID: 7051979229013910260}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7766515573874350568
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6346336572382360563}
m_Modifications:
- target: {fileID: 4018315547665848156, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_Name
value: Semi Circle
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_SizeDelta.x
value: 569.1716
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_SizeDelta.y
value: 274.7567
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalScale.z
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalRotation.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_AnchoredPosition.x
value: -22.815613
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_AnchoredPosition.y
value: -185.42004
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 180
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
--- !u!224 &49955372140070849 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7744307764399824425, guid: 672d03f1267bd475e8e13138745d7a26, type: 3}
m_PrefabInstance: {fileID: 7766515573874350568}
m_PrefabAsset: {fileID: 0}

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

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

2
Assets/Darkmatter/Content/Colorbook UI/Prefabs/SlotMarkers/Circle.prefab
View File

@@ -37,7 +37,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 11, y: -181}
m_SizeDelta: {x: 381, y: 381}
m_SizeDelta: {x: 1016, y: 1016}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2486631034057256172
CanvasRenderer:

2
Assets/Darkmatter/Content/Colorbook UI/Prefabs/SlotMarkers/Semi Circle.prefab
View File

@@ -37,7 +37,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 1016, y: 508}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6365559784855574788
CanvasRenderer:

4
Assets/Darkmatter/Content/Colorbook UI/Prefabs/SlotMarkers/Semi Oval.prefab
View File

@@ -37,7 +37,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 1683, y: 383}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8696052209776578822
CanvasRenderer:
@@ -60,7 +60,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

2
Assets/Darkmatter/Content/Colorbook UI/Prefabs/SlotMarkers/Triangle.prefab
View File

@@ -37,7 +37,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 14, y: -2}
m_SizeDelta: {x: 386, y: 387}
m_SizeDelta: {x: 941, y: 1087}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7065549689243831870
CanvasRenderer:

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

39
Assets/Darkmatter/Data/Drawings/Templates/Diyo.asset Normal file
View File

@@ -0,0 +1,39 @@
%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: Diyo
m_EditorClassIdentifier: Core::Darkmatter.Core.Data.Static.Features.DrawingTemplate.DrawingTemplateSO
id: Diyo
displayName: Diyo
defaultThumbnail: {fileID: 21300000, guid: 91ae3e8699bf93148932e8488f10b3f6, type: 3}
drawingPrefab: {fileID: 4945602003854698950, guid: c999c33cfbb0c5e449d391d8c5d8ab20, type: 3}
coloringPrefab: {fileID: 2116797317990409869, guid: e3fc57db76eb3e44491f83c65d35ffa6, type: 3}
completionAnimationPrefab: {fileID: 0}
pieces:
- {fileID: 11400000, guid: f5c929a6f977347d0ad820f3c75fad22, type: 2}
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
- {fileID: 11400000, guid: a3dc108a48b1e4f2196e8d49ae8e3edd, type: 2}
- {fileID: 11400000, guid: acfdb9428bcd74a85bade833220add1c, type: 2}
regions:
- RegionId: ColoringPart
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: ColoringPart__1
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: ColoringPart__2
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: ColoringPart__3
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: ColoringPart__4
InitialColor: {r: 1, g: 1, b: 1, a: 1}
- RegionId: ColoringPart__5
InitialColor: {r: 1, g: 1, b: 1, a: 1}
colorPaletteId: defaultPalette

8
Assets/Darkmatter/Data/Drawings/Templates/Diyo.asset.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5f3b8273533c8514cbc5f46cf86f90e8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

21
Assets/Darkmatter/Data/Settings/Rendering/UniversalRenderPipelineGlobalSettings.asset
View File

@@ -68,20 +68,7 @@ MonoBehaviour:
- rid: 570818657416118287
- rid: 570818657416118288
m_RuntimeSettings:
m_List:
- rid: 7752762179098771456
- rid: 7752762179098771457
- rid: 7752762179098771459
- rid: 7752762179098771462
- rid: 7752762179098771464
- rid: 7752762179098771466
- rid: 7752762179098771468
- rid: 7752762179098771472
- rid: 7752762179098771476
- rid: 3114554777721110529
- rid: 3114554777721110530
- rid: 570818657416118282
- rid: 570818657416118283
m_List: []
m_AssetVersion: 10
m_ObsoleteDefaultVolumeProfile: {fileID: 0}
m_RenderingLayerNames:
@@ -231,6 +218,11 @@ MonoBehaviour:
type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_PanelSettings: {fileID: 11400000, guid: fa69697be3070b04a893666f5947f18c, type: 2}
m_StyleSheets:
- {fileID: 7433441132597879392, guid: 0ff99fd36f66f1a41bcc1d3c90e0922a, type: 3}
- {fileID: 7433441132597879392, guid: 3a8aa4d508da46d4dace18b280f064aa, type: 3}
m_VisualTreeAsset: {fileID: 9197481963319205126, guid: b647ceb1e15264943b9b439971e71110, type: 3}
- rid: 570818657416118288
type: {class: WorldRenderPipelineResources, ns: UnityEngine.PathTracing.Core, asm: Unity.PathTracing.Runtime}
data:
@@ -351,6 +343,7 @@ MonoBehaviour:
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_SimpleLitMaterial: {fileID: 2100000, guid: 6a1143ee683302f4aa628c052723efc1, type: 2}
m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2}
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}

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

@@ -2890,7 +2890,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1950265411}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c97afc556caea1c44969477eb7ddec74, type: 3}
m_Name:

4
Assets/Spine/Editor/spine-unity/Editor/Asset Types/SpineAtlasAssetInspector.cs
View File

@@ -136,7 +136,7 @@ namespace Spine.Unity.Editor {
if (SpineInspectorUtility.LargeCenteredButton(SpineInspectorUtility.TempContent("Set Mipmap Bias to " + SpinePreferences.DEFAULT_MIPMAPBIAS, tooltip: "This may help textures with mipmaps be less blurry when used for 2D sprites."))) {
foreach (var m in atlasAsset.materials) {
var texture = m.mainTexture;
string texturePath = AssetDatabase.GetAssetPath(texture.GetInstanceID());
string texturePath = AssetDatabase.GetAssetPath(texture.GetEntityId());
var importer = (TextureImporter)TextureImporter.GetAtPath(texturePath);
importer.mipMapBias = SpinePreferences.DEFAULT_MIPMAPBIAS;
EditorUtility.SetDirty(texture);
@@ -313,7 +313,7 @@ namespace Spine.Unity.Editor {
}
static public void UpdateSpriteSlices (Texture texture, Atlas atlas) {
string texturePath = AssetDatabase.GetAssetPath(texture.GetInstanceID());
string texturePath = AssetDatabase.GetAssetPath(texture.GetEntityId());
var t = (TextureImporter)TextureImporter.GetAtPath(texturePath);
t.spriteImportMode = SpriteImportMode.Multiple;
var spriteSheet = t.spritesheet;

6
Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
View File

@@ -384,7 +384,7 @@ namespace Spine.Unity.Editor {
foreach (var skeletonGraphic in skeletonGraphicObjects) {
if (skeletonGraphic.skeletonDataAsset == null) {
var skeletonGraphicID = skeletonGraphic.GetInstanceID();
var skeletonGraphicID = skeletonGraphic.GetEntityId();
if (SpineEditorUtilities.DataReloadHandler.savedSkeletonDataAssetAtSKeletonGraphicID.ContainsKey(skeletonGraphicID)) {
string assetPath = SpineEditorUtilities.DataReloadHandler.savedSkeletonDataAssetAtSKeletonGraphicID[skeletonGraphicID];
skeletonGraphic.skeletonDataAsset = (SkeletonDataAsset)AssetDatabase.LoadAssetAtPath<SkeletonDataAsset>(assetPath);
@@ -447,9 +447,9 @@ namespace Spine.Unity.Editor {
for (int i = 0; i < skeletonDataAtlasAssets.Length; i++) {
if (!ReferenceEquals(null, skeletonDataAtlasAssets[i]) &&
skeletonDataAtlasAssets[i].Equals(null) &&
skeletonDataAtlasAssets[i].GetInstanceID() != 0
skeletonDataAtlasAssets[i].GetEntityId() != EntityId.None
) {
skeletonDataAtlasAssets[i] = EditorUtility.InstanceIDToObject(skeletonDataAtlasAssets[i].GetInstanceID()) as AtlasAssetBase;
skeletonDataAtlasAssets[i] = EditorUtility.EntityIdToObject(skeletonDataAtlasAssets[i].GetEntityId()) as AtlasAssetBase;
}
}
}

4
Assets/Spine/Editor/spine-unity/Editor/Utility/DataReloadHandler.cs
View File

@@ -49,7 +49,7 @@ namespace Spine.Unity.Editor {
public partial class SpineEditorUtilities {
public static class DataReloadHandler {
internal static Dictionary<int, string> savedSkeletonDataAssetAtSKeletonGraphicID = new Dictionary<int, string>();
internal static Dictionary<EntityId, string> savedSkeletonDataAssetAtSKeletonGraphicID = new Dictionary<EntityId, string>();
#if NEWPLAYMODECALLBACKS
internal static void OnPlaymodeStateChanged (PlayModeStateChange stateChange) {
@@ -84,7 +84,7 @@ namespace Spine.Unity.Editor {
var skeletonDataAsset = sg.skeletonDataAsset;
if (skeletonDataAsset != null) {
var assetPath = AssetDatabase.GetAssetPath(skeletonDataAsset);
var sgID = sg.GetInstanceID();
var sgID = sg.GetEntityId();
savedSkeletonDataAssetAtSKeletonGraphicID[sgID] = assetPath;
skeletonDataAssetsToReload.Add(skeletonDataAsset);
}

52
Assets/Spine/Editor/spine-unity/Editor/Utility/SpineEditorUtilities.cs
View File

@@ -134,8 +134,8 @@ namespace Spine.Unity.Editor {
SceneView.onSceneGUIDelegate += DragAndDropInstantiation.SceneViewDragAndDrop;
#endif
EditorApplication.hierarchyWindowItemOnGUI -= HierarchyHandler.HandleDragAndDrop;
EditorApplication.hierarchyWindowItemOnGUI += HierarchyHandler.HandleDragAndDrop;
EditorApplication.hierarchyWindowItemByEntityIdOnGUI -= HierarchyHandler.HandleDragAndDrop;
EditorApplication.hierarchyWindowItemByEntityIdOnGUI += HierarchyHandler.HandleDragAndDrop;
// Hierarchy Icons
#if NEWPLAYMODECALLBACKS
@@ -274,10 +274,10 @@ namespace Spine.Unity.Editor {
#endregion
public static class HierarchyHandler {
static Dictionary<int, GameObject> skeletonRendererTable = new Dictionary<int, GameObject>();
static Dictionary<int, SkeletonUtilityBone> skeletonUtilityBoneTable = new Dictionary<int, SkeletonUtilityBone>();
static Dictionary<int, BoundingBoxFollower> boundingBoxFollowerTable = new Dictionary<int, BoundingBoxFollower>();
static Dictionary<int, BoundingBoxFollowerGraphic> boundingBoxFollowerGraphicTable = new Dictionary<int, BoundingBoxFollowerGraphic>();
static Dictionary<EntityId, GameObject> skeletonRendererTable = new Dictionary<EntityId, GameObject>();
static Dictionary<EntityId, SkeletonUtilityBone> skeletonUtilityBoneTable = new Dictionary<EntityId, SkeletonUtilityBone>();
static Dictionary<EntityId, BoundingBoxFollower> boundingBoxFollowerTable = new Dictionary<EntityId, BoundingBoxFollower>();
static Dictionary<EntityId, BoundingBoxFollowerGraphic> boundingBoxFollowerGraphicTable = new Dictionary<EntityId, BoundingBoxFollowerGraphic>();
#if NEWPLAYMODECALLBACKS
internal static void IconsOnPlaymodeStateChanged (PlayModeStateChange stateChange) {
@@ -294,7 +294,7 @@ namespace Spine.Unity.Editor {
#else
EditorApplication.hierarchyWindowChanged -= IconsOnChanged;
#endif
EditorApplication.hierarchyWindowItemOnGUI -= IconsOnGUI;
EditorApplication.hierarchyWindowItemByEntityIdOnGUI -= IconsOnGUI;
if (!Application.isPlaying && Preferences.showHierarchyIcons) {
#if NEWHIERARCHYWINDOWCALLBACKS
@@ -302,7 +302,7 @@ namespace Spine.Unity.Editor {
#else
EditorApplication.hierarchyWindowChanged += IconsOnChanged;
#endif
EditorApplication.hierarchyWindowItemOnGUI += IconsOnGUI;
EditorApplication.hierarchyWindowItemByEntityIdOnGUI += IconsOnGUI;
IconsOnChanged();
}
}
@@ -315,54 +315,54 @@ namespace Spine.Unity.Editor {
SkeletonRenderer[] arr = Object.FindObjectsOfType<SkeletonRenderer>();
foreach (SkeletonRenderer r in arr)
skeletonRendererTable[r.gameObject.GetInstanceID()] = r.gameObject;
skeletonRendererTable[r.gameObject.GetEntityId()] = r.gameObject;
SkeletonUtilityBone[] boneArr = Object.FindObjectsOfType<SkeletonUtilityBone>();
foreach (SkeletonUtilityBone b in boneArr)
skeletonUtilityBoneTable[b.gameObject.GetInstanceID()] = b;
skeletonUtilityBoneTable[b.gameObject.GetEntityId()] = b;
BoundingBoxFollower[] bbfArr = Object.FindObjectsOfType<BoundingBoxFollower>();
foreach (BoundingBoxFollower bbf in bbfArr)
boundingBoxFollowerTable[bbf.gameObject.GetInstanceID()] = bbf;
boundingBoxFollowerTable[bbf.gameObject.GetEntityId()] = bbf;
BoundingBoxFollowerGraphic[] bbfgArr = Object.FindObjectsOfType<BoundingBoxFollowerGraphic>();
foreach (BoundingBoxFollowerGraphic bbf in bbfgArr)
boundingBoxFollowerGraphicTable[bbf.gameObject.GetInstanceID()] = bbf;
boundingBoxFollowerGraphicTable[bbf.gameObject.GetEntityId()] = bbf;
}
internal static void IconsOnGUI (int instanceId, Rect selectionRect) {
internal static void IconsOnGUI (EntityId entityId, Rect selectionRect) {
Rect r = new Rect(selectionRect);
if (skeletonRendererTable.ContainsKey(instanceId)) {
if (skeletonRendererTable.ContainsKey(entityId)) {
r.x = r.width - 15;
r.width = 15;
GUI.Label(r, Icons.spine);
} else if (skeletonUtilityBoneTable.ContainsKey(instanceId)) {
} else if (skeletonUtilityBoneTable.ContainsKey(entityId)) {
r.x -= 26;
if (skeletonUtilityBoneTable[instanceId] != null) {
if (skeletonUtilityBoneTable[instanceId].transform.childCount == 0)
if (skeletonUtilityBoneTable[entityId] != null) {
if (skeletonUtilityBoneTable[entityId].transform.childCount == 0)
r.x += 13;
r.y += 2;
r.width = 13;
r.height = 13;
if (skeletonUtilityBoneTable[instanceId].mode == SkeletonUtilityBone.Mode.Follow)
if (skeletonUtilityBoneTable[entityId].mode == SkeletonUtilityBone.Mode.Follow)
GUI.DrawTexture(r, Icons.bone);
else
GUI.DrawTexture(r, Icons.poseBones);
}
} else if (boundingBoxFollowerTable.ContainsKey(instanceId)) {
} else if (boundingBoxFollowerTable.ContainsKey(entityId)) {
r.x -= 26;
if (boundingBoxFollowerTable[instanceId] != null) {
if (boundingBoxFollowerTable[instanceId].transform.childCount == 0)
if (boundingBoxFollowerTable[entityId] != null) {
if (boundingBoxFollowerTable[entityId].transform.childCount == 0)
r.x += 13;
r.y += 2;
r.width = 13;
r.height = 13;
GUI.DrawTexture(r, Icons.boundingBox);
}
} else if (boundingBoxFollowerGraphicTable.ContainsKey(instanceId)) {
} else if (boundingBoxFollowerGraphicTable.ContainsKey(entityId)) {
r.x -= 26;
if (boundingBoxFollowerGraphicTable[instanceId] != null) {
if (boundingBoxFollowerGraphicTable[instanceId].transform.childCount == 0)
if (boundingBoxFollowerGraphicTable[entityId] != null) {
if (boundingBoxFollowerGraphicTable[entityId].transform.childCount == 0)
r.x += 13;
r.y += 2;
r.width = 13;
@@ -372,7 +372,7 @@ namespace Spine.Unity.Editor {
}
}
internal static void HandleDragAndDrop (int instanceId, Rect selectionRect) {
internal static void HandleDragAndDrop (EntityId entityId, Rect selectionRect) {
// HACK: Uses EditorApplication.hierarchyWindowItemOnGUI.
// Only works when there is at least one item in the scene.
var current = UnityEngine.Event.current;
@@ -397,7 +397,7 @@ namespace Spine.Unity.Editor {
const string GenericDataTargetID = "target";
if (HierarchyWindow.Equals(mouseOverWindow.GetType().ToString(), System.StringComparison.Ordinal)) {
if (isDraggingEvent) {
var mouseOverTarget = UnityEditor.EditorUtility.InstanceIDToObject(instanceId);
var mouseOverTarget = UnityEditor.EditorUtility.EntityIdToObject(entityId);
if (mouseOverTarget)
DragAndDrop.SetGenericData(GenericDataTargetID, mouseOverTarget);
// Note: do not call current.Use(), otherwise we get the wrong drop-target parent.

4
Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs
View File

@@ -646,8 +646,8 @@ namespace Spine.Unity {
class AnimationClipEqualityComparer : IEqualityComparer<AnimationClip> {
internal static readonly IEqualityComparer<AnimationClip> Instance = new AnimationClipEqualityComparer();
public bool Equals (AnimationClip x, AnimationClip y) { return x.GetInstanceID() == y.GetInstanceID(); }
public int GetHashCode (AnimationClip o) { return o.GetInstanceID(); }
public bool Equals (AnimationClip x, AnimationClip y) { return x.GetEntityId().Equals(y.GetEntityId()); }
public int GetHashCode (AnimationClip o) { return o.GetEntityId().GetHashCode(); }
}
class IntEqualityComparer : IEqualityComparer<int> {