Update PostProcessing (#21)

* Update PostProcessing * Rename CameraViewportAdjustor * Change Files' Path * Update * Refine warning message * Update Warning Canvas --------- Co-authored-by: yucrazing <723284893@qq.com>
taichi-dev · Jun 29, 2023 · cdcf5ea · cdcf5ea
1 parent c6bc432
commit cdcf5ea
Show file tree

Hide file tree

Showing 31 changed files with 1,595 additions and 26 deletions.
diff --git a/...t2D/Materials/Prototype/3DParticleMat.mat → Assets/Soft2D/Materials/3DParticleMat.mat b/...t2D/Materials/Prototype/3DParticleMat.mat → Assets/Soft2D/Materials/3DParticleMat.mat
diff --git a/...aterials/Prototype/3DParticleMat.mat.meta → ...s/Soft2D/Materials/3DParticleMat.mat.meta b/...aterials/Prototype/3DParticleMat.mat.meta → ...s/Soft2D/Materials/3DParticleMat.mat.meta
diff --git a/...terials/Prototype/3DParticleShader.shader → .../Soft2D/Materials/3DParticleShader.shader b/...terials/Prototype/3DParticleShader.shader → .../Soft2D/Materials/3DParticleShader.shader
diff --git a/...ls/Prototype/3DParticleShader.shader.meta → ...2D/Materials/3DParticleShader.shader.meta b/...ls/Prototype/3DParticleShader.shader.meta → ...2D/Materials/3DParticleShader.shader.meta
diff --git a/...2D/Materials/Prototype/PBRParticleMat.mat → Assets/Soft2D/Materials/PBRParticleMat.mat b/...2D/Materials/Prototype/PBRParticleMat.mat → Assets/Soft2D/Materials/PBRParticleMat.mat
diff --git a/...terials/Prototype/PBRParticleMat.mat.meta → .../Soft2D/Materials/PBRParticleMat.mat.meta b/...terials/Prototype/PBRParticleMat.mat.meta → .../Soft2D/Materials/PBRParticleMat.mat.meta
diff --git a/...erials/Prototype/PBRParticleShader.shader → ...Soft2D/Materials/PBRParticleShader.shader b/...erials/Prototype/PBRParticleShader.shader → ...Soft2D/Materials/PBRParticleShader.shader
diff --git a/...s/Prototype/PBRParticleShader.shader.meta → ...D/Materials/PBRParticleShader.shader.meta b/...s/Prototype/PBRParticleShader.shader.meta → ...D/Materials/PBRParticleShader.shader.meta
diff --git a/.../Materials/Prototype/UnlitParticleMat.mat → Assets/Soft2D/Materials/UnlitParticleMat.mat b/.../Materials/Prototype/UnlitParticleMat.mat → Assets/Soft2D/Materials/UnlitParticleMat.mat
diff --git a/...rials/Prototype/UnlitParticleMat.mat.meta → ...oft2D/Materials/UnlitParticleMat.mat.meta b/...rials/Prototype/UnlitParticleMat.mat.meta → ...oft2D/Materials/UnlitParticleMat.mat.meta
diff --git a/...ials/Prototype/UnlitParticleShader.shader → ...ft2D/Materials/UnlitParticleShader.shader b/...ials/Prototype/UnlitParticleShader.shader → ...ft2D/Materials/UnlitParticleShader.shader
diff --git a/...Prototype/UnlitParticleShader.shader.meta → ...Materials/UnlitParticleShader.shader.meta b/...Prototype/UnlitParticleShader.shader.meta → ...Materials/UnlitParticleShader.shader.meta
diff --git a/Assets/Soft2D/Samples/01_WaterWheel/WaterWheel.unity b/Assets/Soft2D/Samples/01_WaterWheel/WaterWheel.unity
@@ -1354,3 +1354,122 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 7.07, y: 0.78}
   m_EdgeRadius: 0
+--- !u!1001 &6420410362969829329
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261118, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_Name
+      value: WarningCanvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: baccef826fc2d9243a42ac731ef3dc26, type: 3}
diff --git a/Assets/Soft2D/Samples/02_2DGame/Level 1.unity b/Assets/Soft2D/Samples/02_2DGame/Level 1.unity
@@ -1970,6 +1970,125 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 7292076413682499022}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &889250694
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261114, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6118645846271261118, guid: baccef826fc2d9243a42ac731ef3dc26,
+        type: 3}
+      propertyPath: m_Name
+      value: WarningCanvas
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: baccef826fc2d9243a42ac731ef3dc26, type: 3}
 --- !u!1 &947860904 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1161309370213670688, guid: abd937719b287894a8cbc2e4595bdf57,
@@ -35684,7 +35803,7 @@ PrefabInstance:
     - target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
         type: 3}
       propertyPath: orthographic size
-      value: 1.1836563
+      value: 1.1844481
       objectReference: {fileID: 0}
     - target: {fileID: 3949743919671436436, guid: dcf12b49f3b24a84abf5c8e11c6156d8,
         type: 3}
@@ -35833,6 +35952,11 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6020688668772917787, guid: abd937719b287894a8cbc2e4595bdf57,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7292076412367778661, guid: abd937719b287894a8cbc2e4595bdf57,
         type: 3}
       propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target