Merge remote-tracking branch 'origin/master'

ActionTowerDefense/Assets/PIDI Game Development Framework/Planar Reflections 4/Universal Rendering Pipeline/Shaders/Water/Shader Graphs_Water (Advanced).mat

@@ -11,10 +11,10 @@ Material:
   m_Shader: {fileID: -6465566751694194690, guid: df7154b5fd570834ba7977e15023cab9, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords: []
-  m_LightmapFlags: 4
+  m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: 2950
   stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:
@@ -29,7 +29,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _WaterGradient:
-        m_Texture: {fileID: 2800000, guid: 9180463a2094f2a47baf4135c372732d, type: 3}
+        m_Texture: {fileID: 2800000, guid: 3e1b2454e6da96f4c96d73b963f4f5e6, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _WavesMap:
@@ -54,14 +54,14 @@ Material:
     - Vector1_EF8DA9C1: 0
     - _FoamWidth: 0
     - _QueueControl: 1
-    - _QueueOffset: 0
+    - _QueueOffset: -50
     - _Smoothness: 1
-    - _WaterBottom: 8.3
+    - _WaterBottom: 8.15
     - _WaterClarity: -3
     m_Colors:
-    - _FoamColor: {r: 1, g: 1, b: 1, a: 0.18431373}
+    - _FoamColor: {r: 1, g: 1, b: 1, a: 1}
     - _FoamData: {r: 0.3, g: 0.3, b: 0.05, a: 0.15}
-    - _WaveData0: {r: 0, g: 0.3, b: 0, a: 0.4}
+    - _WaveData0: {r: 0, g: 0.5, b: 0, a: 0.4}
     - _WaveData1: {r: 50, g: 1, b: 0, a: 0}
   m_BuildTextureStacks: []
 --- !u!114 &306269229745474052

ActionTowerDefense/Assets/Scenes/Game.unity

@@ -25,8 +25,8 @@ RenderSettings:
   m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
   m_AmbientIntensity: 1
   m_AmbientMode: 3
-  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
-  m_SkyboxMaterial: {fileID: 2100000, guid: 7410c7593fd196a4b8effeff26d93dd6, type: 2}
+  m_SubtractiveShadowColor: {r: 0.68462974, g: 0.7178157, b: 0.8018868, a: 1}
+  m_SkyboxMaterial: {fileID: 2100000, guid: 8fe2b67874cb22f43800c75dcf38673f, type: 2}
   m_HaloStrength: 0.5
   m_FlareStrength: 1
   m_FlareFadeSpeed: 3
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.5444019, g: 0.50700164, b: 0.5242697, a: 1}
+  m_IndirectSpecularColor: {r: 0.08285994, g: 0.21821517, b: 0.21182504, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -6992,6 +6992,11 @@ Canvas:
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
+--- !u!1 &618117355 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5446471054063718445, guid: e5c00bfb08ae78849af0c262fa477a7a, type: 3}
+  m_PrefabInstance: {fileID: 5446471054285334609}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &618545937
 GameObject:
   m_ObjectHideFlags: 0
@@ -7209,11 +7214,39 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 720337677}
   m_CullTransparentMesh: 1
---- !u!20 &733902871 stripped
-Camera:
-  m_CorrespondingSourceObject: {fileID: 5446471054063718446, guid: e5c00bfb08ae78849af0c262fa477a7a, type: 3}
-  m_PrefabInstance: {fileID: 5446471054285334609}
+--- !u!114 &733902874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 618117355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
 --- !u!1 &738314638
 GameObject:
   m_ObjectHideFlags: 0
@@ -14416,7 +14449,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 2
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -21337,6 +21370,10 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: -3.32
       objectReference: {fileID: 0}
+    - target: {fileID: 1903750611, guid: 956ff4379e83d3c49a9c10310dbf7cc7, type: 3}
+      propertyPath: m_SortingOrder
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1903750612, guid: 956ff4379e83d3c49a9c10310dbf7cc7, type: 3}
       propertyPath: ShapeModule.m_Scale.z
       value: 10
@@ -21776,10 +21813,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 973089825944650134, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_SortingOrder
-      value: 20
-      objectReference: {fileID: 0}
     - target: {fileID: 973089825946997993, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
       propertyPath: m_RootOrder
       value: 10
@@ -21828,90 +21861,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: Bg_water
       objectReference: {fileID: 0}
-    - target: {fileID: 973089826307401904, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_SortingOrder
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826649423840, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_SortingOrder
-      value: 20
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826983986784, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalScale.y
-      value: -20.939018
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826983986784, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -11.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826983986784, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -6.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826983986784, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826983986784, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826983986784, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089826983986799, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_SortingOrder
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 973089827903394650, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 90.59
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310329812789252, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310329812789255, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 7.600465
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310329812789255, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 79.71
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_Camera
-      value: 
-      objectReference: {fileID: 733902871}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_RTHeightAtten
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_ReflectionTint.b
-      value: 0.625623
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_ReflectionTint.g
-      value: 0.6415094
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_ReflectionTint.r
-      value: 0.5355998
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_RTReflectionColor
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_ReflectionStrength
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7173310330332029677, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
-      propertyPath: m_RTOriginalReflectionColor
-      value: 
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8e99578d43abbeb4d95b0ae7f30a436a, type: 3}
 --- !u!222 &1307057236685265174

ActionTowerDefense/Assets/Scenes/Scence/Bg_water.prefab

@@ -5445,7 +5445,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 973089826983986785}
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -31.6, y: -11.3, z: 5.8}
+  m_LocalPosition: {x: -31.6, y: -11.3, z: -3.6}
   m_LocalScale: {x: 258.8562, y: -20.939018, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5492,7 +5492,7 @@ SpriteRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 20
+  m_SortingOrder: 10
   m_Sprite: {fileID: 21300000, guid: e8178131dc79b68489eec792acc528e3, type: 3}
   m_Color: {r: 0.6039216, g: 0.72156864, b: 0.64705884, a: 1}
   m_FlipX: 0
@@ -10420,9 +10420,9 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 641191679
-  m_SortingLayer: -1
-  m_SortingOrder: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -1000
   m_Sprite: {fileID: 21300000, guid: 47744b6067327e24d90ad5df0670c734, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
@@ -10569,7 +10569,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1428988199306083933, guid: d5123b1469d82ed4d992a88421a92da5, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 70.5
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 1428988199306083933, guid: d5123b1469d82ed4d992a88421a92da5, type: 3}
       propertyPath: m_LocalPosition.z
@@ -10637,17 +10637,21 @@ PrefabInstance:
       propertyPath: _settings.renderShadows
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3825808385025537369, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
+      propertyPath: _settings.accurateMatrix
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3825808385025537369, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
       propertyPath: _settings.backgroundColor.b
-      value: 0.35582656
+      value: 0.60000014
       objectReference: {fileID: 0}
     - target: {fileID: 3825808385025537369, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
       propertyPath: _settings.backgroundColor.g
-      value: 0.49056602
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3825808385025537369, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
       propertyPath: _settings.backgroundColor.r
-      value: 0.15503736
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 5798686610445838164, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
       propertyPath: m_LocalScale.z
@@ -10663,7 +10667,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7930183323585829396, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
       propertyPath: m_LocalScale.z
-      value: 5.0308995
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 7930183323585829396, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
       propertyPath: m_LocalPosition.x
@@ -10795,7 +10799,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8861517063431830621, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}
       propertyPath: m_DynamicOccludee
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1fc3666bf218beb4e9a1ab67215b2870, type: 3}

ActionTowerDefense/Assets/Toolkits/Rope/Examples/00_Main/Materials/Sky.mat

@@ -64,7 +64,7 @@ Material:
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
-    - _Exposure: 3.57
+    - _Exposure: 4.39
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
@@ -84,5 +84,5 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _GroundColor: {r: 0, g: 0, b: 0, a: 1}
-    - _SkyTint: {r: 0, g: 0.8962264, b: 0.4217536, a: 1}
+    - _SkyTint: {r: 0.23589355, g: 0.8773585, b: 0.53841853, a: 1}
   m_BuildTextureStacks: []