Updating PC version

6 年前 · ee4fa3c0
--- a/Assets/IslandScene/Fish/Preset_FishOrange.preset
+++ b/Assets/IslandScene/Fish/Preset_FishOrange.preset
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.size
-    value: 24
+    value: 28
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[0].first
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[2].first
-    value: Vector1_C01861B7
+    value: Vector1_67434760
-    value: 12.6
+    value: 1
-    value: Vector1_E0D0D54F
+    value: Vector1_9F48B413
-    value: -2.3
+    value: 5
-    value: _AlphaClip
+    value: Vector1_C01861B7
-    value: 0
+    value: 12.6
-    value: _Blend
+    value: Vector1_C62E7565
-    value: 0
+    value: 2
-    value: _BumpScale
+    value: Vector1_CBD19B6D
-    value: 1
+    value: 0.3
-    value: _Cull
+    value: Vector1_E0D0D54F
-    value: 2
+    value: -2.3
-    value: _Cutoff
+    value: _AlphaClip
-    value: 0.5
+    value: 0
-    value: _DetailNormalMapScale
+    value: _Blend
-    value: 1
+    value: 0
-    value: _DstBlend
+    value: _BumpScale
-    value: 0
+    value: 1
-    value: _GlossMapScale
+    value: _Cull
-    value: 1
+    value: 2
-    value: _Glossiness
+    value: _Cutoff
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[12].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[13].first
-    value: _GlossyReflections
+    value: _DetailNormalMapScale
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[13].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[14].first
-    value: _Metallic
+    value: _DstBlend
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[14].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[15].first
-    value: _OcclusionStrength
+    value: _GlossMapScale
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[15].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[16].first
-    value: _Parallax
+    value: _Glossiness
-    value: 0.02
+    value: 0.5
-    value: _SmoothnessTextureChannel
+    value: _GlossyReflections
-    value: 0
+    value: 1
-    value: _SpecularHighlights
+    value: _Metallic
-    value: 1
+    value: 0
-    value: _SrcBlend
+    value: _OcclusionStrength
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[19].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[20].first
-    value: _Surface
+    value: _Parallax
-    value: 0
+    value: 0.02
-    value: _UVSec
+    value: _SmoothnessTextureChannel
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[21].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[22].first
-    value: _WorkflowMode
+    value: _SpecularHighlights
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[22].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[23].first
+    value: _SrcBlend
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[23].second
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[24].first
+    value: _Surface
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[24].second
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[25].first
+    value: _UVSec
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[25].second
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[26].first
+    value: _WorkflowMode
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[26].second
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[27].first
-    propertyPath: m_SavedProperties.m_Floats.Array.data[23].second
+    propertyPath: m_SavedProperties.m_Floats.Array.data[27].second
    value: 1
    objectReference: {fileID: 0}
  - target: {fileID: 0}
--- a/Assets/IslandScene/Scene_Island.unity
+++ b/Assets/IslandScene/Scene_Island.unity
--- a/Assets/IslandScene/Water/Preset_IslandWater-1.preset
+++ b/Assets/IslandScene/Water/Preset_IslandWater-1.preset
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.size
-    value: 51
+    value: 58
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[0].first
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[4].first
-    value: Vector1_221E0A39
+    value: Vector1_213C6A32
-    value: 0.97
+    value: 14
-    value: Vector1_3B6C6CA7
+    value: Vector1_221E0A39
-    value: 0.04
+    value: 0.97
-    value: Vector1_40E2F0ED
+    value: Vector1_3B6C6CA7
-    value: 0.5
+    value: 0.04
-    value: Vector1_4735D5E2
+    value: Vector1_40E2F0ED
-    value: 0.42
+    value: 0.5
-    value: Vector1_5685904E
+    value: Vector1_4735D5E2
-    value: 1.22
+    value: 0.42
-    value: Vector1_5721F4C2
+    value: Vector1_503C980E
-    value: 0.63
+    value: 0.6
-    value: Vector1_5D17CBA2
+    value: Vector1_5685904E
-    value: 0.3
+    value: 1.22
-    value: Vector1_608CA392
+    value: Vector1_5721F4C2
-    value: 1
+    value: 0.63
-    value: Vector1_632F7C2E
+    value: Vector1_5D17CBA2
-    value: 1.54
+    value: 0.3
-    value: Vector1_72D9B0C5
+    value: Vector1_608CA392
-    value: 1.5
+    value: 1
-    value: Vector1_730BBE62
+    value: Vector1_632F7C2E
-    value: 0.799
+    value: 1.54
-    value: Vector1_770B5A60
+    value: Vector1_6EF52C6
-    value: 1.67
+    value: 2
-    value: Vector1_7FD4B9D0
+    value: Vector1_72D9B0C5
-    value: 1
+    value: 1.5
-    value: Vector1_8403193C
+    value: Vector1_72F0D5FC
-    value: 1.01
+    value: 0
-    value: Vector1_8D2F509D
+    value: Vector1_730BBE62
-    value: 1.64
+    value: 0.799
-    value: Vector1_95BDBEC1
+    value: Vector1_770B5A60
-    value: 8
+    value: 1.67
-    value: Vector1_961065ED
+    value: Vector1_7FD4B9D0
-    value: 0.028
+    value: 1
-    value: Vector1_A04E5E21
+    value: Vector1_8403193C
-    value: 1.67
+    value: 1.01
-    value: Vector1_A6C44B0B
+    value: Vector1_8D2F509D
-    value: 0.25
+    value: 1.64
-    value: Vector1_B4A117B7
+    value: Vector1_95BDBEC1
-    value: 0.3
+    value: 8
-    value: Vector1_B9797993
+    value: Vector1_961065ED
-    value: 0.5
+    value: 0.028
-    value: Vector1_C800E0A4
+    value: Vector1_9872C2E5
-    value: 0.4
+    value: 0
-    value: Vector1_E58F6327
+    value: Vector1_A04E5E21
-    value: 1
+    value: 1.67
-    value: Vector1_F1BE6F9F
+    value: Vector1_A6C44B0B
-    value: 0.253
+    value: 0.25
-    value: Vector1_F44D25A0
+    value: Vector1_B4A117B7
-    value: 0.411
+    value: 0.3
-    value: Vector1_F68B8AAF
+    value: Vector1_B9797993
-    value: 1
+    value: 0.5
-    value: Vector1_F9DF03AF
+    value: Vector1_C800E0A4
-    value: 35
+    value: 0.4
-    value: _AlphaClip
+    value: Vector1_E58F6327
-    value: 0
+    value: 1
-    value: _Blend
+    value: Vector1_F1BE6F9F
-    value: 0
+    value: 0.253
-    value: _BumpScale
+    value: Vector1_F44D25A0
-    value: 1
+    value: 0.411
-    value: _Cull
+    value: Vector1_F68B8AAF
-    value: 2
+    value: 1
-    value: _Cutoff
+    value: Vector1_F9DF03AF
-    value: 0.5
+    value: 35
-    value: _DetailNormalMapScale
+    value: Vector1_FA3225CB
-    value: 1
+    value: 6
-    value: _DstBlend
+    value: Vector1_FF940B40
-    value: 0
+    value: 1
-    value: _GlossMapScale
+    value: _AlphaClip
-    value: 1
+    value: 0
-    value: _Glossiness
+    value: _Blend
-    value: 0.5
+    value: 0
-    value: _GlossyReflections
+    value: _BumpScale
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[40].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[41].first
-    value: _Metallic
+    value: _Cull
-    value: 0
+    value: 2
-    value: _OcclusionStrength
+    value: _Cutoff
-    value: 1
+    value: 0.5
-    value: _Parallax
+    value: _DetailNormalMapScale
-    value: 0.02
+    value: 1
-    value: _SmoothnessTextureChannel
+    value: _DstBlend
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[44].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[45].first
-    value: _SpecularHighlights
+    value: _GlossMapScale
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[45].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[46].first
-    value: _SrcBlend
+    value: _Glossiness
-    value: 1
+    value: 0.5
-    value: _Surface
+    value: _GlossyReflections
-    value: 0
+    value: 1
-    value: _UVSec
+    value: _Metallic
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[48].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[49].first
-    value: _WorkflowMode
+    value: _OcclusionStrength
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Floats.Array.data[49].second
    propertyPath: m_SavedProperties.m_Floats.Array.data[50].first
-    value: _ZWrite
+    value: _Parallax
+    value: 0.02
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[51].first
+    value: _SmoothnessTextureChannel
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[51].second
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[52].first
+    value: _SpecularHighlights
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[52].second
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[53].first
+    value: _SrcBlend
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[53].second
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[54].first
+    value: _Surface
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[54].second
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[55].first
+    value: _UVSec
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[55].second
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[56].first
+    value: _WorkflowMode
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[56].second
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[57].first
+    value: _ZWrite
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Floats.Array.data[57].second
-    value: 10
+    value: 12
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[0].first
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[1].first
-    value: Color_3974F997
+    value: Color_277E2D14
-    value: 0.14509794
+    value: 0.14509797
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[1].second.g
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[2].first
-    value: Vector2_1000B2F1
+    value: Color_3974F997
-    value: 0
+    value: 0.14509794
-    value: 1
+    value: 0.9490196
-    value: 0
+    value: 1
-    value: 0
+    value: 1
-    value: Vector2_113ECD47
+    value: Color_ACACFC30
-    value: 0.5
+    value: 0.14509785
-    value: 0.5
+    value: 0.9490196
-    value: 0
+    value: 1
-    value: 0
+    value: 1
-    value: Vector2_7922229F
+    value: Vector2_1000B2F1
-    value: 0.25
+    value: 0
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[4].second.g
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[5].first
-    value: Vector2_BE5D86FE
+    value: Vector2_113ECD47
-    value: 0.1
+    value: 0.5
-    value: 0.1
+    value: 0.5
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[5].second.b
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[6].first
-    value: Vector2_FA95DCD5
+    value: Vector2_7922229F
-    value: 0.59
+    value: 0.25
-    value: 0.55
+    value: 1
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[6].second.b
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[7].first
-    value: _Color
+    value: Vector2_BE5D86FE
-    value: 0.5
+    value: 0.1
-    value: 0.5
+    value: 0.1
-    value: 0.5
+    value: 0
-    value: 1
+    value: 0
-    value: _EmissionColor
+    value: Vector2_FA95DCD5
-    value: 0
+    value: 0.59
-    value: 0
+    value: 0.55
    objectReference: {fileID: 0}
  - target: {fileID: 0}
    propertyPath: m_SavedProperties.m_Colors.Array.data[8].second.b
    propertyPath: m_SavedProperties.m_Colors.Array.data[8].second.a
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[9].first
+    value: _Color
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.r
+    value: 0.5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.g
+    value: 0.5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.b
+    value: 0.5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.a
-    propertyPath: m_SavedProperties.m_Colors.Array.data[9].first
+    propertyPath: m_SavedProperties.m_Colors.Array.data[10].first
+    value: _EmissionColor
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[10].second.r
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[10].second.g
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[10].second.b
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[10].second.a
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SavedProperties.m_Colors.Array.data[11].first
-    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.r
+    propertyPath: m_SavedProperties.m_Colors.Array.data[11].second.r
-    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.g
+    propertyPath: m_SavedProperties.m_Colors.Array.data[11].second.g
-    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.b
+    propertyPath: m_SavedProperties.m_Colors.Array.data[11].second.b
-    propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.a
+    propertyPath: m_SavedProperties.m_Colors.Array.data[11].second.a
    value: 1
    objectReference: {fileID: 0}
--- a/Assets/IslandScene/Water/Shader_IslandWater.ShaderGraph
+++ b/Assets/IslandScene/Water/Shader_IslandWater.ShaderGraph
--- a/Assets/ProCore/Polybrush/Color
+++ b/Assets/ProCore/Polybrush/Color
  m_Script: {fileID: 11500000, guid: faf7db05d259ffb47b2b158a2e462d2a, type: 3}
  m_Name: Default
  m_EditorClassIdentifier: 
-  current: {r: 1, g: 1, b: 1, a: 1}
+  current: {r: 0, g: 0, b: 0, a: 1}
  colors:
  - {r: 0, g: 0.122, b: 0.247, a: 1}
  - {r: 0, g: 0.455, b: 0.851, a: 1}
--- a/Assets/Settings/PostProcessProfile.asset
+++ b/Assets/Settings/PostProcessProfile.asset
    overrideState: 1
    value: 1
  gradingMode:
-    overrideState: 0
-    value: 1
+    overrideState: 1
+    value: 0
  externalLut:
    overrideState: 0
    value: {fileID: 0}
    value: 1
  temperature:
    overrideState: 0
-    value: 0
+    value: -18
  tint:
    overrideState: 0
    value: 0
  m_Script: {fileID: 11500000, guid: 40b924e2dad56384a8df2a1e111bb675, type: 3}
  m_Name: Vignette
  m_EditorClassIdentifier: 
-  active: 1
+  active: 0
  enabled:
    overrideState: 1
    value: 1
--- a/Assets/IslandScene/Water/Shader_Normals.ShaderGraph
+++ b/Assets/IslandScene/Water/Shader_Normals.ShaderGraph
--- a/Assets/IslandScene/Water/Shader_Normals.ShaderGraph.meta
+++ b/Assets/IslandScene/Water/Shader_Normals.ShaderGraph.meta
+fileFormatVersion: 2
+guid: 5dd38b891505622498a7d54dfba18b5d
+ScriptedImporter:
+  fileIDToRecycleName:
+    4800000: MainAsset
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}