Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support built-in Pipeline #2

Merged
merged 1 commit into from
Jun 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Assets/Soft2D/Samples/02_2DGame/Level 1.unity
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -2123,7 +2123,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -2223,7 +2223,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -35283,7 +35283,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -35656,7 +35656,7 @@ MonoBehaviour:
isRandom: 0
uniformColor:
serializedVersion: 2
rgba: 0
rgba: 4291395840
randColors: []
rainbow: 0
OnEmitterOut:
Expand Down
9 changes: 4 additions & 5 deletions Assets/Soft2D/Samples/02_2DGame/Level 10.unity
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ MonoBehaviour:
particleTag: 1
uniformColor:
serializedVersion: 2
rgba: 0
rgba: 4291395840
randomColor: 0
shapeType: 0
halfWidth: 0.3
Expand Down Expand Up @@ -901,7 +901,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -4866,7 +4866,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: efd15ed1f2e271a44a28f87d93c62ddf, type: 3}
m_Name:
m_EditorClassIdentifier:
isInitialized: 0
--- !u!61 &675228264
BoxCollider2D:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5102,7 +5101,7 @@ PrefabInstance:
- target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
propertyPath: orthographic size
value: 1.2090218
value: 1.0618955
objectReference: {fileID: 0}
- target: {fileID: 3949743919671436438, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
Expand Down Expand Up @@ -5420,7 +5419,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
8 changes: 4 additions & 4 deletions Assets/Soft2D/Samples/02_2DGame/Level 2.unity
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ PrefabInstance:
- target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
propertyPath: orthographic size
value: 1.2090218
value: 1.0618955
objectReference: {fileID: 0}
- target: {fileID: 3949743919671436438, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
Expand Down Expand Up @@ -805,7 +805,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -25457,7 +25457,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -25567,7 +25567,7 @@ MonoBehaviour:
isRandom: 0
uniformColor:
serializedVersion: 2
rgba: 0
rgba: 4291395840
randColors: []
rainbow: 0
OnEmitterOut:
Expand Down
13 changes: 6 additions & 7 deletions Assets/Soft2D/Samples/02_2DGame/Level 3.unity
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -1986,7 +1986,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 05109b3e6a1fdf948bb2bfeffa2c0abd, type: 3}
m_Name:
m_EditorClassIdentifier:
isInitialized: 0
collisionType: 0
frictionCoefficient: 0
restitutionCoefficient: 0
Expand Down Expand Up @@ -2121,7 +2120,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -2282,7 +2281,7 @@ PrefabInstance:
- target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
propertyPath: orthographic size
value: 1.111691
value: 1.0618955
objectReference: {fileID: 0}
- target: {fileID: 3949743919671436438, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
Expand Down Expand Up @@ -2527,7 +2526,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -2627,7 +2626,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -24619,7 +24618,7 @@ MonoBehaviour:
poissonsRatio: 0.2
particleTag: 1
isRandom: 0
baseColor:
uniformColor:
serializedVersion: 2
rgba: 4291395840
randColors: []
Expand Down
8 changes: 4 additions & 4 deletions Assets/Soft2D/Samples/02_2DGame/Level 4.unity
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ PrefabInstance:
- target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
propertyPath: orthographic size
value: 1.2090218
value: 1.0618955
objectReference: {fileID: 0}
- target: {fileID: 3949743919671436438, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
Expand Down Expand Up @@ -533,7 +533,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -2299,7 +2299,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -52869,7 +52869,7 @@ MonoBehaviour:
particleTag: 1
uniformColor:
serializedVersion: 2
rgba: 0
rgba: 4291395840
randomColor: 0
shapeType: 0
halfWidth: 0.2
Expand Down
6 changes: 3 additions & 3 deletions Assets/Soft2D/Samples/02_2DGame/Level 5.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -3379,7 +3379,7 @@ PrefabInstance:
- target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
propertyPath: orthographic size
value: 1.2090218
value: 1.0618955
objectReference: {fileID: 0}
- target: {fileID: 3949743919671436438, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
Expand Down Expand Up @@ -3628,7 +3628,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
16 changes: 8 additions & 8 deletions Assets/Soft2D/Samples/02_2DGame/Level 6.unity
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -3653,7 +3653,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -3892,7 +3892,7 @@ PrefabInstance:
- target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
propertyPath: orthographic size
value: 1.2090218
value: 1.0618955
objectReference: {fileID: 0}
- target: {fileID: 3949743919671436438, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
Expand Down Expand Up @@ -4044,7 +4044,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -4209,7 +4209,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -4309,7 +4309,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -26282,7 +26282,7 @@ MonoBehaviour:
isRandom: 0
uniformColor:
serializedVersion: 2
rgba: 0
rgba: 4291395840
randColors: []
rainbow: 0
OnEmitterOut:
Expand Down Expand Up @@ -26352,7 +26352,7 @@ SpriteRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down
10 changes: 4 additions & 6 deletions Assets/Soft2D/Samples/02_2DGame/Level 7.unity
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -2342,7 +2342,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 05109b3e6a1fdf948bb2bfeffa2c0abd, type: 3}
m_Name:
m_EditorClassIdentifier:
isInitialized: 0
collisionType: 0
frictionCoefficient: 0
restitutionCoefficient: 0
Expand Down Expand Up @@ -2403,7 +2402,7 @@ MonoBehaviour:
youngsModulus: 5
poissonsRatio: 0.2
particleTag: 1
baseColor:
uniformColor:
serializedVersion: 2
rgba: 4291395840
randomColor: 0
Expand Down Expand Up @@ -2536,7 +2535,7 @@ PrefabInstance:
- target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
propertyPath: orthographic size
value: 1.111691
value: 1.0618955
objectReference: {fileID: 0}
- target: {fileID: 3949743919671436438, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
type: 3}
Expand Down Expand Up @@ -2798,7 +2797,7 @@ TilemapRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand Down Expand Up @@ -24778,7 +24777,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 05109b3e6a1fdf948bb2bfeffa2c0abd, type: 3}
m_Name:
m_EditorClassIdentifier:
isInitialized: 0
collisionType: 0
frictionCoefficient: 0
restitutionCoefficient: 0
Expand Down
Loading