From c75285710751c241bb983b238b64af694cf1f196 Mon Sep 17 00:00:00 2001 From: M1_IDMhan Date: Thu, 24 Aug 2023 15:51:53 +0900 Subject: [PATCH] [Hotfix] Unity upgrade bug --- BlueWater/Assets/01.Scenes/02.Main.unity | 121 ++---------------- BlueWater/Assets/02.Scripts/DataManager.cs | 7 +- .../AddressableAssetSettings.asset | 4 +- .../LibraryUrp/LitForwardPass_DR.hlsl | 8 +- .../Materials/CPT_Terrain_03.mat | 14 +- .../Plugins/Sirenix/Assemblies/AOT.meta | 8 ++ .../Sirenix.Serialization.AOTGenerated.dll | Bin 0 -> 2560 bytes ...irenix.Serialization.AOTGenerated.dll.meta | 33 +++++ .../Assemblies/AOT/link.xml.backup.txt | 3 + .../Assemblies/AOT/link.xml.backup.txt.meta | 7 + .../Sirenix.Serialization.dll.backup.txt | 79 ++++++++++++ .../Sirenix.Serialization.dll.backup.txt.meta | 7 + .../NoEditor/Sirenix.Serialization.dll.meta | 67 +++------- .../NoEditor/Sirenix.Utilities.dll.backup.txt | 79 ++++++++++++ .../Sirenix.Utilities.dll.backup.txt.meta | 7 + .../NoEditor/Sirenix.Utilities.dll.meta | 67 +++------- .../Sirenix.Serialization.dll.backup.txt | 76 +++++++++++ .../Sirenix.Serialization.dll.backup.txt.meta | 7 + .../Sirenix.Serialization.dll.meta | 58 ++------- .../Sirenix.Utilities.dll.backup.txt | 76 +++++++++++ .../Sirenix.Utilities.dll.backup.txt.meta | 7 + .../Sirenix.Utilities.dll.meta | 58 ++------- ...irenix.Serialization.Config.dll.backup.txt | 46 +++++++ ...x.Serialization.Config.dll.backup.txt.meta | 7 + .../Sirenix.Serialization.Config.dll.meta | 60 ++++----- .../{link.xml => link.xml.backup.txt} | 0 ...link.xml.meta => link.xml.backup.txt.meta} | 0 .../Config/Editor/AOTGenerationConfig.asset | 2 +- .../GlobalSerializationConfig.asset | 0 .../GlobalSerializationConfig.asset.meta | 0 ...olygonPirates_Characters_Material_01_A.mat | 76 ++++++++++- .../PolygonPirates_Material_01_A.mat | 14 +- .../PolygonPirates_Material_01_B.mat | 76 ++++++++++- .../PolygonPirates_Material_01_C.mat | 76 ++++++++++- .../PolygonPirates_Material_02_A.mat | 76 ++++++++++- .../PolygonPirates_Material_02_B.mat | 78 ++++++++++- .../PolygonPirates_Material_02_C.mat | 76 ++++++++++- .../PolygonPirates_Material_03_A.mat | 76 ++++++++++- .../PolygonPirates_Material_03_B.mat | 78 ++++++++++- .../PolygonPirates_Material_03_C.mat | 81 +++++++++++- .../PolygonPirates_Material_04_A.mat | 76 ++++++++++- .../PolygonPirates_Material_04_B.mat | 78 ++++++++++- .../PolygonPirates_Material_04_C.mat | 78 ++++++++++- .../DemoScene/DemoScene.unity.meta | 7 + .../DemoScene/LightingData.asset.meta | 7 + .../DemoScene/ReflectionProbe-0.exr.meta | 7 + .../DemoScene/Materials/CubeMaterial.mat.meta | 7 + .../Editor/Resources/TOON_WATER_LOGO.png.meta | 7 + .../Editor/ToonWaterInspector.cs.meta | 7 + ...lculateDepthDifference.shadersubgraph.meta | 7 + ...ferenceMobileOptimized.shadersubgraph.meta | 7 + .../Functions/ClipValues.cginc.meta | 7 + .../Functions/DirLightInfo.cginc.meta | 7 + .../Functions/OtherLightsInfo.cginc.meta | 7 + .../Textures/waterFoamNoiseTexture.png.meta | 7 + .../Textures/waterNormalTexture.png.meta | 7 + .../Toon Water Mobile 1.mat.meta | 7 + .../Toon Water Mobile Fast.mat.meta | 7 + .../Toon Water Shader Mobile.shadergraph.meta | 7 + .../Assets/Toon Water URP/README.txt.meta | 7 + .../Scripts/PlanarReflectionsRenderer.cs.meta | 7 + .../Toon Water Material 1.mat.meta | 7 + .../Toon Water Material 2.mat.meta | 7 + .../Toon Water Material 3.mat.meta | 7 + .../Toon Water Shader.shadergraph.meta | 7 + ...ect Post-process Volume Profile.asset.meta | 8 ++ .../Colors/1 SKIN-DARKEST-LPUP.mat | 13 +- .../- Materials/Colors/10 BROWN-DARK-LPUP.mat | 13 +- .../Colors/11 BROWN-MEDIUM-LPUP.mat | 13 +- .../- Materials/Colors/12 BROWN-LPUP.mat | 13 +- .../Colors/13 BROWN-LIGHT-LPUP.mat | 13 +- .../Colors/14 BROWN LIGHTEST-LPUP.mat | 13 +- .../Colors/15 BROWN-WHITE-LPUP.mat | 13 +- .../Colors/17 GREY-DARKEST-LPUP.mat | 13 +- .../- Materials/Colors/18 GREY-DARK-LPUP.mat | 13 +- .../Colors/19 GREY-MEDIUM-LPUP.mat | 13 +- .../- Materials/Colors/2 SKIN-DARK-LPUP.mat | 13 +- .../- Materials/Colors/20 GREY-LPUP.mat | 14 +- .../- Materials/Colors/21 GREY-LIGHT-LPUP.mat | 13 +- .../Colors/22 GREY-LIGHTEST-LPUP.mat | 13 +- .../- Materials/Colors/23 GREY-WHITE-LPUP.mat | 13 +- .../Colors/25 RED-DARKEST-LPUP.mat | 13 +- .../- Materials/Colors/26 RED-DARK-LPUP.mat | 13 +- .../- Materials/Colors/27 RED-LPUP.mat | 13 +- .../- Materials/Colors/28 ORANGE-LPUP.mat | 13 +- .../Colors/29 ORANGE-LIGHT-LPUP.mat | 13 +- .../- Materials/Colors/3 SKIN-MEDIUM-LPUP.mat | 13 +- .../- Materials/Colors/30 YELLOW-LPUP.mat | 13 +- .../Colors/31 YELLOW-LIGHT-LPUP.mat | 13 +- .../Colors/33 GREEN-DARKEST-LPUP.mat | 13 +- .../- Materials/Colors/34 GREEN-DARK-LPUP.mat | 13 +- .../Colors/35 GREEN-MEDIUM-LPUP.mat | 13 +- .../- Materials/Colors/36 GREEN-LPUP.mat | 13 +- .../Colors/37 GREEN-LIGHT-LPUP.mat | 13 +- .../Colors/38 GREEN-LIGHTEST-LPUP.mat | 13 +- .../Colors/39 GREEN-WHITE-LPUP.mat | 13 +- .../- Materials/Colors/4 SKIN-LPUP.mat | 13 +- .../Colors/41 BLUE-DARKEST-LPUP.mat | 13 +- .../- Materials/Colors/42 BLUE-DARK-LPUP.mat | 13 +- .../Colors/43 BLUE-MEDIUM-LPUP.mat | 13 +- .../- Materials/Colors/44 BLUE-LPUP.mat | 13 +- .../- Materials/Colors/45 BLUE-LIGHT-LPUP.mat | 13 +- .../Colors/46 BLUE-LIGHEST-LPUP.mat | 13 +- .../- Materials/Colors/47 BLUE-WHITE-LPUP.mat | 13 +- .../Colors/49 PINK-DARKEST-LPUP.mat | 13 +- .../- Materials/Colors/5 SKIN-LIGHT-LPUP.mat | 13 +- .../- Materials/Colors/50 PINK-DARK-LPUP.mat | 13 +- .../Colors/51 PINK-MEDIUM-LPUP.mat | 13 +- .../- Materials/Colors/52 PINK-LPUP.mat | 13 +- .../- Materials/Colors/53 PINK-LIGHT-LPUP.mat | 13 +- .../- Materials/Colors/57 BLACK-LPUP.mat | 13 +- .../- Materials/Colors/58 WHITE-LPUP.mat | 13 +- .../Colors/6 SKIN-LIGHTEST-LPUP.mat | 13 +- .../- Materials/Colors/64 GLASS-LPUP.mat | 13 +- .../Colors/64 GLASS-NIGHT-LPUP.mat | 14 +- .../- Materials/Colors/7 SKIN-WHITE-LPUP.mat | 13 +- .../Colors/9 BROWN-DARKEST-LPUP.mat | 13 +- .../ProjectSettings/ProjectSettings.asset | 2 +- 118 files changed, 1998 insertions(+), 678 deletions(-) create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT.meta create mode 100755 BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt.meta create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt create mode 100644 BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt.meta rename BlueWater/Assets/Plugins/Sirenix/Assemblies/{link.xml => link.xml.backup.txt} (100%) rename BlueWater/Assets/Plugins/Sirenix/Assemblies/{link.xml.meta => link.xml.backup.txt.meta} (100%) rename BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/{Resources/Sirenix => Editor}/GlobalSerializationConfig.asset (100%) rename BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/{Resources/Sirenix => Editor}/GlobalSerializationConfig.asset.meta (100%) diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 5cc9b8fb5..b7ecf4f3a 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -67,9 +67,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 1024 m_ReflectionCompression: 2 m_MixedBakeMode: 1 m_BakeBackend: 0 @@ -506,7 +503,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2347074, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -3006,7 +3003,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2347074, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -3334,7 +3331,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2347074, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -9281,7 +9278,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2337722, guid: a04e12c67e8230e4aa0ca4061ed89fa4, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -9660,7 +9657,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2343364, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -9763,7 +9760,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2112290658403944419, guid: 769b4ba8d88ef40e2abd78a4282a6951, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: c3963d78833dc43aca36a76888ff2265, type: 2} - target: {fileID: 2679601933808296100, guid: 769b4ba8d88ef40e2abd78a4282a6951, @@ -11900,7 +11897,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2343364, guid: e1c4cc5b9a7d0d7479734ea4167d417e, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -12121,99 +12118,6 @@ Transform: - {fileID: 21664057} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1555303302 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalPosition.x - value: 50.94 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.72 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalPosition.z - value: 25.25 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671939, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671998, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: cellSize - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671998, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: gridWidth - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671998, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: gridHeight - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671999, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_Name - value: RTSBuildMode - objectReference: {fileID: 0} - - target: {fileID: 1716487707546671999, guid: a4f90b099cea30d42a5d938beca51304, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a4f90b099cea30d42a5d938beca51304, type: 3} --- !u!1 &1560348097 GameObject: m_ObjectHideFlags: 0 @@ -12284,7 +12188,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1560348097} - m_Mesh: {fileID: -8670151273213183110, guid: 1e01d80fdc2155d4692276500db33fc9, type: 3} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!4 &1560348101 Transform: m_ObjectHideFlags: 0 @@ -12295,7 +12199,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 1, z: 10} + m_LocalScale: {x: 100, y: 1, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -12806,7 +12710,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2357522, guid: 35a790efcca549d489da6d25d7fb77ee, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -13888,7 +13792,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1871370245} serializedVersion: 2 - m_LocalRotation: {x: 0.6764068, y: -0, z: -0, w: 0.7365283} + m_LocalRotation: {x: 0.67640686, y: -0.0000002980232, z: 0.0000002980232, w: 0.7365283} m_LocalPosition: {x: -0.0000002384187, y: 120, z: -10.000001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -14448,7 +14352,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2368162, guid: a70152ac9ec4ea14e94da160b98b6fad, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 4189525e08801394b984887825dfe498, type: 2} m_RemovedComponents: [] @@ -15658,7 +15562,6 @@ SceneRoots: - {fileID: 734248431} - {fileID: 1540310984} - {fileID: 1228753929} - - {fileID: 1555303302} - {fileID: 1234264508} - {fileID: 2105062291} - {fileID: 1341654437} diff --git a/BlueWater/Assets/02.Scripts/DataManager.cs b/BlueWater/Assets/02.Scripts/DataManager.cs index d450eef85..7c60687ef 100644 --- a/BlueWater/Assets/02.Scripts/DataManager.cs +++ b/BlueWater/Assets/02.Scripts/DataManager.cs @@ -1,14 +1,19 @@ +using System; using System.Collections; using System.Collections.Generic; +using System.Linq; using _02.Scripts.WaterAndShip; using BlueWaterProject; using Sirenix.OdinInspector; +using Sirenix.Serialization; using UnityEngine; public class DataManager : Singleton { + private const int MAX_CARD_NUM = 100; + [Title("DataBase")] - //public IReadOnlyList CardList { get; init; } = new List(10); + public List CardList { get; private set; } = new(MAX_CARD_NUM); [Title("DataBase", "GameObject")] public GameObject mouseSpot; diff --git a/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset index 031c67e10..49444a88b 100644 --- a/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/BlueWater/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -64,9 +64,9 @@ MonoBehaviour: - m_Id: 5cd6c13456d604e5e9a6ad8db28c86ce m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' - m_Id: 8e88d36ff360e4cf8a9dc477780bba2c - m_Value: ServerData/[BuildTarget] + m_Value: 'ServerData/[BuildTarget]' - m_Id: 9c569ce3bfc1f4483b0ddb5a8f38f962 - m_Value: http://[PrivateIpAddress]:[HostingServicePort] + m_Value: 'http://[PrivateIpAddress]:[HostingServicePort]' m_ProfileEntryNames: - m_Id: f976e802859f042bcbf93445e0074b55 m_Name: BuildTarget diff --git a/BlueWater/Assets/FlatKit/Shaders/StylizedSurface/LibraryUrp/LitForwardPass_DR.hlsl b/BlueWater/Assets/FlatKit/Shaders/StylizedSurface/LibraryUrp/LitForwardPass_DR.hlsl index 3f71f196e..efb8d3d20 100644 --- a/BlueWater/Assets/FlatKit/Shaders/StylizedSurface/LibraryUrp/LitForwardPass_DR.hlsl +++ b/BlueWater/Assets/FlatKit/Shaders/StylizedSurface/LibraryUrp/LitForwardPass_DR.hlsl @@ -179,11 +179,11 @@ Varyings StylizedPassVertex(Attributes input) output.dynamicLightmapUV = input.dynamicLightmapUV.xy * unity_DynamicLightmapST.xy + unity_DynamicLightmapST.zw; #endif -#if UNITY_VERSION >= 202310 - OUTPUT_SH(vertexInput.positionWS, output.normalWS.xyz, GetWorldSpaceNormalizeViewDir(vertexInput.positionWS), output.vertexSH); -#else + #if UNITY_VERSION >= 202310 OUTPUT_SH(output.normalWS.xyz, output.vertexSH); -#endif + #else + OUTPUT_SH(output.normalWS.xyz, output.vertexSH); + #endif #ifdef _ADDITIONAL_LIGHTS_VERTEX half3 vertexLight = VertexLighting(vertexInput.positionWS, normalInput.normalWS); diff --git a/BlueWater/Assets/Low Poly Modular Terrain Pack/Terrain_Assets/Materials/CPT_Terrain_03.mat b/BlueWater/Assets/Low Poly Modular Terrain Pack/Terrain_Assets/Materials/CPT_Terrain_03.mat index cd653850a..cb03b7cbb 100644 --- a/BlueWater/Assets/Low Poly Modular Terrain Pack/Terrain_Assets/Materials/CPT_Terrain_03.mat +++ b/BlueWater/Assets/Low Poly Modular Terrain Pack/Terrain_Assets/Materials/CPT_Terrain_03.mat @@ -21,18 +21,22 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CPT_Terrain_03 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_GRADIENT_ON + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT.meta new file mode 100644 index 000000000..e5bfd4fd4 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afcbcb716b76740c48b7274bbde373aa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll new file mode 100755 index 0000000000000000000000000000000000000000..6cbd1391d0acd18b7a21d26e4af22386925d8d62 GIT binary patch literal 2560 zcmeHH&ube;6n-OHva^weq)5RohK}kVkRBF=1cFIvWXZ1U)UK1P9Qj6?V zRJWvL{YqLu@KR)7M0xe;>)2H>qDfA)5!*vmjVL=b@NzQGiN*((Sn%H;@bysah4Axf z0Ai}wxNdk#I8jUYh2wSN8fu{Bn!&_yLD!-FlN` zOOCT{+Aej2j^_)ZTaH6Xrl{`}rRk#z<_nL);zXP9kKb*0^8b}RRn5{3WW@P}(^`=| zFT-L1K+7x?5SS}@xL$33u2d>{C{&v-rkhcpR1lbyC4^&sRwM~ zX%e`s@Tx)wn4_=hTkww*^Q*!?fEl{Tfi7WZmTqHbmiFikT2M?$;k3e86`fVl8;UU%>huAIzd;7@B9-VZoKU6F1EhaJ z4&lju6G`4i6_}9d^2#AB1e$1AB3U{&lj$}ryIhzO~<}(hPLO%YZ6ZQ zq<2Ekr`07hG_MKM0@Dw+&XVM|OlL=27v?9?vg^JbVwqC?P}8-;{bhICc7=}Lomls* z9Td~>9HbuzM$CJj-!(&-=9;+ch>oo7n8UFRuiJCP-sXN!yim^2ru4;)%@yGa-wcIC z??flROILicE8MVw|8+UOy&kS-%SM-X1#YGz0@`SQjH7V{>JFB>HY&0fgFtlK&i-PE zP3@gf$V7qgcSWBW=tnm?$Q>eg@<8K1-@mmrb^ht+Bb->8v+3eQx?C)<>=++mx#?m# zQ!Z9mVG3$4QUxfCI?IfWq_TynQT6oJr@wu-`_;p>Z<=R*`16bAPf7Y$M)Uapq58^n K{JPPB8~6v3!2;m` literal 0 HcmV?d00001 diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta new file mode 100644 index 000000000..75b54c143 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: 226840293c2ac4d54b6bde684b80c8bd +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt new file mode 100644 index 000000000..efdda3af0 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt.meta new file mode 100644 index 000000000..34db5811e --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.backup.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 430eab0f6d7674d099742c5617d3dbf3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt new file mode 100644 index 000000000..1a97dca0c --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt @@ -0,0 +1,79 @@ +fileFormatVersion: 2 +guid: 5651992cdad94894a3af7dc3f1da9170 +timeCreated: 1488828285 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Any: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude N3DS: 0 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 0 + Exclude PSM: 0 + Exclude PSP2: 0 + Exclude SamsungTV: 0 + Exclude Tizen: 0 + Exclude WebGL: 0 + Exclude WiiU: 0 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 0 + Exclude XboxOne: 0 + Exclude iOS: 0 + Exclude tvOS: 0 + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + N3DS: + enabled: 1 + settings: {} + PS4: + enabled: 1 + settings: {} + PSM: + enabled: 1 + settings: {} + PSP2: + enabled: 1 + settings: {} + SamsungTV: + enabled: 1 + settings: {} + Tizen: + enabled: 1 + settings: {} + WebGL: + enabled: 1 + settings: {} + WiiU: + enabled: 1 + settings: {} + WindowsStoreApps: + enabled: 1 + settings: + CPU: AnyCPU + XboxOne: + enabled: 1 + settings: {} + iOS: + enabled: 1 + settings: {} + tvOS: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt.meta new file mode 100644 index 000000000..78ed2143b --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.backup.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ee9983f96a0fd4e9ca9acd18632ee13c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta index 1a97dca0c..0020d5ca2 100644 --- a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Serialization.dll.meta @@ -1,4 +1,4 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 5651992cdad94894a3af7dc3f1da9170 timeCreated: 1488828285 PluginImporter: @@ -16,64 +16,27 @@ PluginImporter: Exclude Linux: 1 Exclude Linux64: 1 Exclude LinuxUniversal: 1 - Exclude N3DS: 0 + Exclude N3DS: 1 Exclude OSXIntel: 1 Exclude OSXIntel64: 1 Exclude OSXUniversal: 1 - Exclude PS4: 0 - Exclude PSM: 0 - Exclude PSP2: 0 - Exclude SamsungTV: 0 - Exclude Tizen: 0 - Exclude WebGL: 0 - Exclude WiiU: 0 + Exclude PS4: 1 + Exclude PSM: 1 + Exclude PSP2: 1 + Exclude SamsungTV: 1 + Exclude Tizen: 1 + Exclude WebGL: 1 + Exclude WiiU: 1 Exclude Win: 1 Exclude Win64: 1 - Exclude WindowsStoreApps: 0 - Exclude XboxOne: 0 - Exclude iOS: 0 - Exclude tvOS: 0 + Exclude WindowsStoreApps: 1 + Exclude XboxOne: 1 + Exclude iOS: 1 + Exclude tvOS: 1 Editor: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} - PS4: - enabled: 1 - settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} - WebGL: - enabled: 1 - settings: {} - WiiU: - enabled: 1 - settings: {} - WindowsStoreApps: - enabled: 1 - settings: - CPU: AnyCPU - XboxOne: - enabled: 1 - settings: {} - iOS: - enabled: 1 - settings: {} - tvOS: - enabled: 1 - settings: {} - userData: - assetBundleName: + userData: + assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt new file mode 100644 index 000000000..21e88ae13 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt @@ -0,0 +1,79 @@ +fileFormatVersion: 2 +guid: 5978f8f3dd274e848fbb7a123bde1fb9 +timeCreated: 1488828285 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Any: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 1 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude N3DS: 0 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 0 + Exclude PSM: 0 + Exclude PSP2: 0 + Exclude SamsungTV: 0 + Exclude Tizen: 0 + Exclude WebGL: 0 + Exclude WiiU: 0 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 0 + Exclude XboxOne: 0 + Exclude iOS: 0 + Exclude tvOS: 0 + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + N3DS: + enabled: 1 + settings: {} + PS4: + enabled: 1 + settings: {} + PSM: + enabled: 1 + settings: {} + PSP2: + enabled: 1 + settings: {} + SamsungTV: + enabled: 1 + settings: {} + Tizen: + enabled: 1 + settings: {} + WebGL: + enabled: 1 + settings: {} + WiiU: + enabled: 1 + settings: {} + WindowsStoreApps: + enabled: 1 + settings: + CPU: AnyCPU + XboxOne: + enabled: 1 + settings: {} + iOS: + enabled: 1 + settings: {} + tvOS: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt.meta new file mode 100644 index 000000000..c87f1f70a --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.backup.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 42f6140c64ec84bd99be8ebdc60ecf8a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta index 21e88ae13..3f75cce00 100644 --- a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEditor/Sirenix.Utilities.dll.meta @@ -1,4 +1,4 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 5978f8f3dd274e848fbb7a123bde1fb9 timeCreated: 1488828285 PluginImporter: @@ -16,64 +16,27 @@ PluginImporter: Exclude Linux: 1 Exclude Linux64: 1 Exclude LinuxUniversal: 1 - Exclude N3DS: 0 + Exclude N3DS: 1 Exclude OSXIntel: 1 Exclude OSXIntel64: 1 Exclude OSXUniversal: 1 - Exclude PS4: 0 - Exclude PSM: 0 - Exclude PSP2: 0 - Exclude SamsungTV: 0 - Exclude Tizen: 0 - Exclude WebGL: 0 - Exclude WiiU: 0 + Exclude PS4: 1 + Exclude PSM: 1 + Exclude PSP2: 1 + Exclude SamsungTV: 1 + Exclude Tizen: 1 + Exclude WebGL: 1 + Exclude WiiU: 1 Exclude Win: 1 Exclude Win64: 1 - Exclude WindowsStoreApps: 0 - Exclude XboxOne: 0 - Exclude iOS: 0 - Exclude tvOS: 0 + Exclude WindowsStoreApps: 1 + Exclude XboxOne: 1 + Exclude iOS: 1 + Exclude tvOS: 1 Editor: enabled: 0 settings: DefaultValueInitialized: true - N3DS: - enabled: 1 - settings: {} - PS4: - enabled: 1 - settings: {} - PSM: - enabled: 1 - settings: {} - PSP2: - enabled: 1 - settings: {} - SamsungTV: - enabled: 1 - settings: {} - Tizen: - enabled: 1 - settings: {} - WebGL: - enabled: 1 - settings: {} - WiiU: - enabled: 1 - settings: {} - WindowsStoreApps: - enabled: 1 - settings: - CPU: AnyCPU - XboxOne: - enabled: 1 - settings: {} - iOS: - enabled: 1 - settings: {} - tvOS: - enabled: 1 - settings: {} - userData: - assetBundleName: + userData: + assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt new file mode 100644 index 000000000..ac8769d2b --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: d2a8f0021d6b47c5923d8972dfb81ef1 +timeCreated: 1488828285 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: {} + Any: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 1 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude N3DS: 1 + Exclude OSXIntel: 0 + Exclude OSXIntel64: 0 + Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PSM: 1 + Exclude PSP2: 1 + Exclude SamsungTV: 1 + Exclude Tizen: 1 + Exclude WebGL: 1 + Exclude WiiU: 1 + Exclude Win: 0 + Exclude Win64: 0 + Exclude WindowsStoreApps: 1 + Exclude XboxOne: 1 + Exclude iOS: 1 + Exclude tvOS: 1 + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + Linux: + enabled: 1 + settings: {} + Linux64: + enabled: 1 + settings: {} + LinuxUniversal: + enabled: 1 + settings: {} + OSXIntel: + enabled: 1 + settings: {} + OSXIntel64: + enabled: 1 + settings: {} + OSXUniversal: + enabled: 1 + settings: {} + PSM: + enabled: 0 + settings: {} + Win: + enabled: 1 + settings: {} + Win64: + enabled: 1 + settings: {} + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt.meta new file mode 100644 index 000000000..3729de310 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.backup.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80034d3e652804b6082f99352841e05c +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta index ac8769d2b..f3e327d28 100644 --- a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Serialization.dll.meta @@ -1,4 +1,4 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: d2a8f0021d6b47c5923d8972dfb81ef1 timeCreated: 1488828285 PluginImporter: @@ -8,21 +8,18 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 platformData: - Android: - enabled: 1 - settings: {} Any: enabled: 0 settings: - Exclude Android: 0 + Exclude Android: 1 Exclude Editor: 1 - Exclude Linux: 0 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 Exclude N3DS: 1 - Exclude OSXIntel: 0 - Exclude OSXIntel64: 0 - Exclude OSXUniversal: 0 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 Exclude PS4: 1 Exclude PSM: 1 Exclude PSP2: 1 @@ -30,8 +27,8 @@ PluginImporter: Exclude Tizen: 1 Exclude WebGL: 1 Exclude WiiU: 1 - Exclude Win: 0 - Exclude Win64: 0 + Exclude Win: 1 + Exclude Win64: 1 Exclude WindowsStoreApps: 1 Exclude XboxOne: 1 Exclude iOS: 1 @@ -40,37 +37,6 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} - Linux64: - enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} - OSXUniversal: - enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: {} - Win64: - enabled: 1 - settings: {} - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: + userData: + assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt new file mode 100644 index 000000000..f158c5501 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 1e0a9643dc0d4b46bf2321f72c4e503e +timeCreated: 1488828285 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Android: + enabled: 1 + settings: {} + Any: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 1 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude N3DS: 1 + Exclude OSXIntel: 0 + Exclude OSXIntel64: 0 + Exclude OSXUniversal: 0 + Exclude PS4: 1 + Exclude PSM: 1 + Exclude PSP2: 1 + Exclude SamsungTV: 1 + Exclude Tizen: 1 + Exclude WebGL: 1 + Exclude WiiU: 1 + Exclude Win: 0 + Exclude Win64: 0 + Exclude WindowsStoreApps: 1 + Exclude XboxOne: 1 + Exclude iOS: 1 + Exclude tvOS: 1 + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + Linux: + enabled: 1 + settings: {} + Linux64: + enabled: 1 + settings: {} + LinuxUniversal: + enabled: 1 + settings: {} + OSXIntel: + enabled: 1 + settings: {} + OSXIntel64: + enabled: 1 + settings: {} + OSXUniversal: + enabled: 1 + settings: {} + PSM: + enabled: 0 + settings: {} + Win: + enabled: 1 + settings: {} + Win64: + enabled: 1 + settings: {} + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt.meta new file mode 100644 index 000000000..c5804df12 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.backup.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c1fedac9d26614bbd8db129253c41be9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta index f158c5501..748b057a1 100644 --- a/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/NoEmitAndNoEditor/Sirenix.Utilities.dll.meta @@ -1,4 +1,4 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 1e0a9643dc0d4b46bf2321f72c4e503e timeCreated: 1488828285 PluginImporter: @@ -8,21 +8,18 @@ PluginImporter: isPreloaded: 0 isOverridable: 0 platformData: - Android: - enabled: 1 - settings: {} Any: enabled: 0 settings: - Exclude Android: 0 + Exclude Android: 1 Exclude Editor: 1 - Exclude Linux: 0 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 Exclude N3DS: 1 - Exclude OSXIntel: 0 - Exclude OSXIntel64: 0 - Exclude OSXUniversal: 0 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 Exclude PS4: 1 Exclude PSM: 1 Exclude PSP2: 1 @@ -30,8 +27,8 @@ PluginImporter: Exclude Tizen: 1 Exclude WebGL: 1 Exclude WiiU: 1 - Exclude Win: 0 - Exclude Win64: 0 + Exclude Win: 1 + Exclude Win64: 1 Exclude WindowsStoreApps: 1 Exclude XboxOne: 1 Exclude iOS: 1 @@ -40,37 +37,6 @@ PluginImporter: enabled: 0 settings: DefaultValueInitialized: true - Linux: - enabled: 1 - settings: {} - Linux64: - enabled: 1 - settings: {} - LinuxUniversal: - enabled: 1 - settings: {} - OSXIntel: - enabled: 1 - settings: {} - OSXIntel64: - enabled: 1 - settings: {} - OSXUniversal: - enabled: 1 - settings: {} - PSM: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: {} - Win64: - enabled: 1 - settings: {} - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: + userData: + assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt b/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt new file mode 100644 index 000000000..cc2b4d363 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt @@ -0,0 +1,46 @@ +fileFormatVersion: 2 +guid: 74721b9f0af448f5ae2e91102a1a5edd +timeCreated: 1488828285 +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Any: + enabled: 1 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude N3DS: 0 + Exclude OSXIntel: 0 + Exclude OSXIntel64: 0 + Exclude OSXUniversal: 0 + Exclude PS4: 0 + Exclude PSM: 0 + Exclude PSP2: 0 + Exclude SamsungTV: 0 + Exclude Tizen: 0 + Exclude WebGL: 0 + Exclude WiiU: 0 + Exclude Win: 0 + Exclude Win64: 0 + Exclude WindowsStoreApps: 0 + Exclude XboxOne: 0 + Exclude iOS: 0 + Exclude tvOS: 0 + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt.meta new file mode 100644 index 000000000..8c4073bc9 --- /dev/null +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.backup.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d6e7ef71a5be143cb832898df926f73a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.meta index cc2b4d363..d59af0a71 100644 --- a/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.meta +++ b/BlueWater/Assets/Plugins/Sirenix/Assemblies/Sirenix.Serialization.Config.dll.meta @@ -1,4 +1,4 @@ -fileFormatVersion: 2 +fileFormatVersion: 2 guid: 74721b9f0af448f5ae2e91102a1a5edd timeCreated: 1488828285 PluginImporter: @@ -9,38 +9,34 @@ PluginImporter: isOverridable: 0 platformData: Any: + enabled: 0 + settings: + Exclude Android: 1 + Exclude Editor: 0 + Exclude Linux: 1 + Exclude Linux64: 1 + Exclude LinuxUniversal: 1 + Exclude N3DS: 1 + Exclude OSXIntel: 1 + Exclude OSXIntel64: 1 + Exclude OSXUniversal: 1 + Exclude PS4: 1 + Exclude PSM: 1 + Exclude PSP2: 1 + Exclude SamsungTV: 1 + Exclude Tizen: 1 + Exclude WebGL: 1 + Exclude WiiU: 1 + Exclude Win: 1 + Exclude Win64: 1 + Exclude WindowsStoreApps: 1 + Exclude XboxOne: 1 + Exclude iOS: 1 + Exclude tvOS: 1 + Editor: enabled: 1 - settings: - Exclude Android: 0 - Exclude Editor: 0 - Exclude Linux: 0 - Exclude Linux64: 0 - Exclude LinuxUniversal: 0 - Exclude N3DS: 0 - Exclude OSXIntel: 0 - Exclude OSXIntel64: 0 - Exclude OSXUniversal: 0 - Exclude PS4: 0 - Exclude PSM: 0 - Exclude PSP2: 0 - Exclude SamsungTV: 0 - Exclude Tizen: 0 - Exclude WebGL: 0 - Exclude WiiU: 0 - Exclude Win: 0 - Exclude Win64: 0 - Exclude WindowsStoreApps: 0 - Exclude XboxOne: 0 - Exclude iOS: 0 - Exclude tvOS: 0 - Editor: - enabled: 0 settings: DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: + userData: + assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml b/BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml.backup.txt similarity index 100% rename from BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml rename to BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml.backup.txt diff --git a/BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml.meta b/BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml.backup.txt.meta similarity index 100% rename from BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml.meta rename to BlueWater/Assets/Plugins/Sirenix/Assemblies/link.xml.backup.txt.meta diff --git a/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset b/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset index 91f67d8a1..257165d82 100644 --- a/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset +++ b/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/AOTGenerationConfig.asset @@ -16,5 +16,5 @@ MonoBehaviour: deleteDllAfterBuilds: 1 AutomateForAllAOTPlatforms: 1 automateForPlatforms: 0900000014000000 - lastScan: 0 + lastScan: 638284879714840760 supportSerializedTypes: [] diff --git a/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset b/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/GlobalSerializationConfig.asset similarity index 100% rename from BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset rename to BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/GlobalSerializationConfig.asset diff --git a/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta b/BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/GlobalSerializationConfig.asset.meta similarity index 100% rename from BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Resources/Sirenix/GlobalSerializationConfig.asset.meta rename to BlueWater/Assets/Plugins/Sirenix/Odin Inspector/Config/Editor/GlobalSerializationConfig.asset.meta diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat index d960d2e70..895662925 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Characters_Material_01_A.mat @@ -8,18 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Characters_Material_01_A - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -33,10 +35,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -85,43 +99,95 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 0 - _Glossiness: 0.25 - _GlossyReflections: 0 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.25 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] --- !u!114 &132426436815802310 MonoBehaviour: diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_A.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_A.mat index e4dda1d02..11a87c6c7 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_A.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_A.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_01_A - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -105,6 +108,7 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_B.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_B.mat index 4ad414e15..bf310e193 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_B.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_B.mat @@ -21,18 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_01_B - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -46,10 +48,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -98,41 +112,93 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_C.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_C.mat index 306f85934..1363895c5 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_C.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_01_C.mat @@ -8,18 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_01_C - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -33,10 +35,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -85,43 +99,95 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 0 - _Glossiness: 0.1 - _GlossyReflections: 0 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] --- !u!114 &5746774319383863707 MonoBehaviour: diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_A.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_A.mat index 2be661850..a5e0c82cd 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_A.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_A.mat @@ -21,18 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_02_A - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -46,10 +48,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -98,41 +112,93 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_B.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_B.mat index 15674fe42..ce69ade07 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_B.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_B.mat @@ -8,18 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_02_B - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -33,10 +35,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -50,7 +64,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 78af1218c051a244488fa7ef5f8c2b07, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -85,43 +99,95 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 0 - _Glossiness: 0.1 - _GlossyReflections: 0 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] --- !u!114 &1025022459894294404 MonoBehaviour: diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_C.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_C.mat index 54209a598..7d58299f6 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_C.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_02_C.mat @@ -21,18 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_02_C - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -46,10 +48,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -98,41 +112,93 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 0 - _Glossiness: 0.1 - _GlossyReflections: 0 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_A.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_A.mat index 6a4142c62..81e418b6f 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_A.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_A.mat @@ -8,18 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_03_A - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -33,10 +35,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -85,43 +99,95 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] --- !u!114 &1023435429987222013 MonoBehaviour: diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_B.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_B.mat index 125949aac..3ebb0f6da 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_B.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_B.mat @@ -21,18 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_03_B - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -46,10 +48,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -63,7 +77,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: cb5e96fe246190f4b8ded4dc50d75dde, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -98,41 +112,93 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_C.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_C.mat index 5495b4603..d6fefc6e4 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_C.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_03_C.mat @@ -8,19 +8,22 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_03_C - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] + stringTagMap: {} + disabledShaderPasses: + - SRPDEFAULTUNLIT m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -33,10 +36,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -50,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: a4e09ba2aa6238f4ea9a2ba7188cce20, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -85,43 +100,95 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] --- !u!114 &6768344551515150364 MonoBehaviour: diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_A.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_A.mat index 07bf205de..14a813af2 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_A.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_A.mat @@ -8,18 +8,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_04_A - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -33,10 +35,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -85,43 +99,95 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] --- !u!114 &4938997478687833825 MonoBehaviour: diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_B.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_B.mat index 442f5a9f1..ea3e80e15 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_B.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_B.mat @@ -21,18 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_04_B - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -46,10 +48,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -63,7 +77,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 433174d60899cd9448650d4dcd2c4a11, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -98,41 +112,93 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_C.mat b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_C.mat index cd3e4ded5..f9b97d92d 100644 --- a/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_C.mat +++ b/BlueWater/Assets/PolygonPirates/Materials/PolygonPirates_Material_04_C.mat @@ -21,18 +21,20 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PolygonPirates_Material_04_C - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: [] + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -46,10 +48,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _CelCurveTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CelStepTexture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DetailMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailMask: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -63,7 +77,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d134021f2af051b4496353b8e759f3a2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -98,41 +112,93 @@ Material: m_Floats: - _AlphaClip: 0 - _AlphaToMask: 0 + - _BaseMapPremultiply: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 - _BumpScale: 1 + - _CameraDistanceImpact: 0 + - _CelExtraEnabled: 0 + - _CelNumSteps: 3 + - _CelPrimaryMode: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 + - _DetailMapBlendingMode: 0 + - _DetailMapImpact: 0 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _DstBlendAlpha: 0 - _EmissionScaleUI: 0 - _EnvironmentReflections: 1 + - _FlatRimEdgeSmoothness: 0.5 + - _FlatRimLightAlign: 0 + - _FlatRimSize: 0.5 + - _FlatSpecularEdgeSmoothness: 0 + - _FlatSpecularSize: 0.1 + - _Flatness: 1 + - _FlatnessExtra: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 + - _GradientAngle: 0 + - _GradientCenterX: 0 + - _GradientCenterY: 0 + - _GradientEnabled: 0 + - _GradientSize: 10 + - _LightContribution: 0 + - _LightFalloffSize: 0 + - _LightmapDirectionPitch: 0 + - _LightmapDirectionYaw: 0 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineDepthOffset: 0 + - _OutlineEnabled: 0 + - _OutlineScale: 1 + - _OutlineWidth: 1 + - _OverrideLightmapDir: 0 - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 + - _RimEnabled: 0 + - _SelfShadingSize: 0.5 + - _SelfShadingSizeExtra: 0.6 + - _ShadowEdgeSize: 0.05 + - _ShadowEdgeSizeExtra: 0.05 - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 + - _SpecularEnabled: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 + - _TextureBlendingMode: 0 + - _TextureImpact: 1 - _UVSec: 0 + - _UnityShadowMode: 0 + - _UnityShadowOcclusion: 0 + - _UnityShadowPower: 0.2 + - _UnityShadowSharpness: 1 + - _VertexColorsEnabled: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorDim: {r: 1, g: 1, b: 1, a: 1} + - _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} + - _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _DetailMapColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0.9485294, g: 0.8084626, b: 0.5579585, a: 1} + - _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056} + - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0} + - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene.unity.meta b/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene.unity.meta index b90bf0074..360173cfd 100644 --- a/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene.unity.meta +++ b/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene.unity.meta @@ -5,3 +5,10 @@ DefaultImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/DemoScene/DemoScene.unity + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/LightingData.asset.meta b/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/LightingData.asset.meta index 4924295ee..bb09e07f3 100644 --- a/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/LightingData.asset.meta +++ b/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/LightingData.asset.meta @@ -6,3 +6,10 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/DemoScene/DemoScene/LightingData.asset + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/ReflectionProbe-0.exr.meta b/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/ReflectionProbe-0.exr.meta index ae91aee78..4b76a633d 100644 --- a/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/ReflectionProbe-0.exr.meta +++ b/BlueWater/Assets/Toon Water URP/DemoScene/DemoScene/ReflectionProbe-0.exr.meta @@ -137,3 +137,10 @@ TextureImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/DemoScene/DemoScene/ReflectionProbe-0.exr + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/DemoScene/Materials/CubeMaterial.mat.meta b/BlueWater/Assets/Toon Water URP/DemoScene/Materials/CubeMaterial.mat.meta index b98c4ebe7..540e40f34 100644 --- a/BlueWater/Assets/Toon Water URP/DemoScene/Materials/CubeMaterial.mat.meta +++ b/BlueWater/Assets/Toon Water URP/DemoScene/Materials/CubeMaterial.mat.meta @@ -6,3 +6,10 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/DemoScene/Materials/CubeMaterial.mat + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Editor/Resources/TOON_WATER_LOGO.png.meta b/BlueWater/Assets/Toon Water URP/Editor/Resources/TOON_WATER_LOGO.png.meta index 0862b2eaf..d5b08c6a2 100644 --- a/BlueWater/Assets/Toon Water URP/Editor/Resources/TOON_WATER_LOGO.png.meta +++ b/BlueWater/Assets/Toon Water URP/Editor/Resources/TOON_WATER_LOGO.png.meta @@ -138,3 +138,10 @@ TextureImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Editor/Resources/TOON_WATER_LOGO.png + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Editor/ToonWaterInspector.cs.meta b/BlueWater/Assets/Toon Water URP/Editor/ToonWaterInspector.cs.meta index a98f3e3bf..e9cf361d2 100644 --- a/BlueWater/Assets/Toon Water URP/Editor/ToonWaterInspector.cs.meta +++ b/BlueWater/Assets/Toon Water URP/Editor/ToonWaterInspector.cs.meta @@ -9,3 +9,10 @@ MonoImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Editor/ToonWaterInspector.cs + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifference.shadersubgraph.meta b/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifference.shadersubgraph.meta index b010c8fa8..f8698e17e 100644 --- a/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifference.shadersubgraph.meta +++ b/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifference.shadersubgraph.meta @@ -8,3 +8,10 @@ ScriptedImporter: assetBundleName: assetBundleVariant: script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3} +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Functions/CalculateDepthDifference.shadersubgraph + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifferenceMobileOptimized.shadersubgraph.meta b/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifferenceMobileOptimized.shadersubgraph.meta index 8a16b88c7..4b7b14199 100644 --- a/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifferenceMobileOptimized.shadersubgraph.meta +++ b/BlueWater/Assets/Toon Water URP/Functions/CalculateDepthDifferenceMobileOptimized.shadersubgraph.meta @@ -8,3 +8,10 @@ ScriptedImporter: assetBundleName: assetBundleVariant: script: {fileID: 11500000, guid: 60072b568d64c40a485e0fc55012dc9f, type: 3} +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Functions/CalculateDepthDifferenceMobileOptimized.shadersubgraph + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Functions/ClipValues.cginc.meta b/BlueWater/Assets/Toon Water URP/Functions/ClipValues.cginc.meta index 4f7f035c5..50829e3c2 100644 --- a/BlueWater/Assets/Toon Water URP/Functions/ClipValues.cginc.meta +++ b/BlueWater/Assets/Toon Water URP/Functions/ClipValues.cginc.meta @@ -7,3 +7,10 @@ ShaderImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Functions/ClipValues.cginc + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Functions/DirLightInfo.cginc.meta b/BlueWater/Assets/Toon Water URP/Functions/DirLightInfo.cginc.meta index 9d67638fe..d6c28f9cd 100644 --- a/BlueWater/Assets/Toon Water URP/Functions/DirLightInfo.cginc.meta +++ b/BlueWater/Assets/Toon Water URP/Functions/DirLightInfo.cginc.meta @@ -7,3 +7,10 @@ ShaderImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Functions/DirLightInfo.cginc + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Functions/OtherLightsInfo.cginc.meta b/BlueWater/Assets/Toon Water URP/Functions/OtherLightsInfo.cginc.meta index a4f40b160..45eb1b9aa 100644 --- a/BlueWater/Assets/Toon Water URP/Functions/OtherLightsInfo.cginc.meta +++ b/BlueWater/Assets/Toon Water URP/Functions/OtherLightsInfo.cginc.meta @@ -7,3 +7,10 @@ ShaderImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Functions/OtherLightsInfo.cginc + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterFoamNoiseTexture.png.meta b/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterFoamNoiseTexture.png.meta index 8bab04883..2fa746bd3 100644 --- a/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterFoamNoiseTexture.png.meta +++ b/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterFoamNoiseTexture.png.meta @@ -137,3 +137,10 @@ TextureImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Mobile version/Textures/waterFoamNoiseTexture.png + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterNormalTexture.png.meta b/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterNormalTexture.png.meta index 96d247519..9ef8e860e 100644 --- a/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterNormalTexture.png.meta +++ b/BlueWater/Assets/Toon Water URP/Mobile version/Textures/waterNormalTexture.png.meta @@ -150,3 +150,10 @@ TextureImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Mobile version/Textures/waterNormalTexture.png + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile 1.mat.meta b/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile 1.mat.meta index 0a7a9f530..556053e4e 100644 --- a/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile 1.mat.meta +++ b/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile 1.mat.meta @@ -6,3 +6,10 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Mobile version/Toon Water Mobile 1.mat + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile Fast.mat.meta b/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile Fast.mat.meta index fe8ba0c10..a5ebc868b 100644 --- a/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile Fast.mat.meta +++ b/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Mobile Fast.mat.meta @@ -6,3 +6,10 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Mobile version/Toon Water Mobile Fast.mat + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Shader Mobile.shadergraph.meta b/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Shader Mobile.shadergraph.meta index 9a77726d8..52be8e48c 100644 --- a/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Shader Mobile.shadergraph.meta +++ b/BlueWater/Assets/Toon Water URP/Mobile version/Toon Water Shader Mobile.shadergraph.meta @@ -8,3 +8,10 @@ ScriptedImporter: assetBundleName: assetBundleVariant: script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Mobile version/Toon Water Shader Mobile.shadergraph + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/README.txt.meta b/BlueWater/Assets/Toon Water URP/README.txt.meta index 92a96b29c..dc2f629ea 100644 --- a/BlueWater/Assets/Toon Water URP/README.txt.meta +++ b/BlueWater/Assets/Toon Water URP/README.txt.meta @@ -5,3 +5,10 @@ TextScriptImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/README.txt + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs.meta b/BlueWater/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs.meta index c4a8ca621..3d5f39d79 100644 --- a/BlueWater/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs.meta +++ b/BlueWater/Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs.meta @@ -9,3 +9,10 @@ MonoImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Scripts/PlanarReflectionsRenderer.cs + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Toon Water Material 1.mat.meta b/BlueWater/Assets/Toon Water URP/Toon Water Material 1.mat.meta index 9ae597bf6..352ed538b 100644 --- a/BlueWater/Assets/Toon Water URP/Toon Water Material 1.mat.meta +++ b/BlueWater/Assets/Toon Water URP/Toon Water Material 1.mat.meta @@ -6,3 +6,10 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Toon Water Material 1.mat + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Toon Water Material 2.mat.meta b/BlueWater/Assets/Toon Water URP/Toon Water Material 2.mat.meta index 0bf4b9b6f..78e95bcaa 100644 --- a/BlueWater/Assets/Toon Water URP/Toon Water Material 2.mat.meta +++ b/BlueWater/Assets/Toon Water URP/Toon Water Material 2.mat.meta @@ -6,3 +6,10 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Toon Water Material 2.mat + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Toon Water Material 3.mat.meta b/BlueWater/Assets/Toon Water URP/Toon Water Material 3.mat.meta index 5edb36847..2b4a30c8a 100644 --- a/BlueWater/Assets/Toon Water URP/Toon Water Material 3.mat.meta +++ b/BlueWater/Assets/Toon Water URP/Toon Water Material 3.mat.meta @@ -6,3 +6,10 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Toon Water Material 3.mat + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Toon Water Shader.shadergraph.meta b/BlueWater/Assets/Toon Water URP/Toon Water Shader.shadergraph.meta index a4bd8be48..bdb52d8be 100644 --- a/BlueWater/Assets/Toon Water URP/Toon Water Shader.shadergraph.meta +++ b/BlueWater/Assets/Toon Water URP/Toon Water Shader.shadergraph.meta @@ -8,3 +8,10 @@ ScriptedImporter: assetBundleName: assetBundleVariant: script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Toon Water Shader.shadergraph + uploadId: 513463 diff --git a/BlueWater/Assets/Toon Water URP/Underwater Post-Processing/Underwater Effect Post-process Volume Profile.asset.meta b/BlueWater/Assets/Toon Water URP/Underwater Post-Processing/Underwater Effect Post-process Volume Profile.asset.meta index d0ef5c321..eae853e41 100644 --- a/BlueWater/Assets/Toon Water URP/Underwater Post-Processing/Underwater Effect Post-process Volume Profile.asset.meta +++ b/BlueWater/Assets/Toon Water URP/Underwater Post-Processing/Underwater Effect Post-process Volume Profile.asset.meta @@ -6,3 +6,11 @@ NativeFormatImporter: userData: assetBundleName: assetBundleVariant: +AssetOrigin: + serializedVersion: 1 + productId: 170520 + packageName: Toon Water URP + packageVersion: 1.19 + assetPath: Assets/Toon Water URP/Underwater Post-Processing/Underwater Effect Post-process + Volume Profile.asset + uploadId: 513463 diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/1 SKIN-DARKEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/1 SKIN-DARKEST-LPUP.mat index 7e918fe09..c202bed99 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/1 SKIN-DARKEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/1 SKIN-DARKEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 1 SKIN-DARKEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/10 BROWN-DARK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/10 BROWN-DARK-LPUP.mat index 96a77f07e..7227b0bc2 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/10 BROWN-DARK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/10 BROWN-DARK-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 10 BROWN-DARK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/11 BROWN-MEDIUM-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/11 BROWN-MEDIUM-LPUP.mat index 6fea543c2..21264ce84 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/11 BROWN-MEDIUM-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/11 BROWN-MEDIUM-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 11 BROWN-MEDIUM-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/12 BROWN-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/12 BROWN-LPUP.mat index 7ca4876d7..484e480ff 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/12 BROWN-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/12 BROWN-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 12 BROWN-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/13 BROWN-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/13 BROWN-LIGHT-LPUP.mat index b0845d44c..eaf73bf4b 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/13 BROWN-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/13 BROWN-LIGHT-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 13 BROWN-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/14 BROWN LIGHTEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/14 BROWN LIGHTEST-LPUP.mat index c3ffde278..5e023d619 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/14 BROWN LIGHTEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/14 BROWN LIGHTEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 14 BROWN LIGHTEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/15 BROWN-WHITE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/15 BROWN-WHITE-LPUP.mat index 6b836f66a..c246c7f54 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/15 BROWN-WHITE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/15 BROWN-WHITE-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 15 BROWN-WHITE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/17 GREY-DARKEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/17 GREY-DARKEST-LPUP.mat index 328ec10e2..eb847a185 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/17 GREY-DARKEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/17 GREY-DARKEST-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 17 GREY-DARKEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/18 GREY-DARK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/18 GREY-DARK-LPUP.mat index 56286e11c..de024b968 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/18 GREY-DARK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/18 GREY-DARK-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 18 GREY-DARK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/19 GREY-MEDIUM-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/19 GREY-MEDIUM-LPUP.mat index c26f12ddb..6b84235e7 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/19 GREY-MEDIUM-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/19 GREY-MEDIUM-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 19 GREY-MEDIUM-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/2 SKIN-DARK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/2 SKIN-DARK-LPUP.mat index 3a5ea351a..52de13dae 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/2 SKIN-DARK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/2 SKIN-DARK-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 2 SKIN-DARK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/20 GREY-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/20 GREY-LPUP.mat index d11fd6ab6..766338b75 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/20 GREY-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/20 GREY-LPUP.mat @@ -21,18 +21,22 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 20 GREY-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_GRADIENT_ON + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/21 GREY-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/21 GREY-LIGHT-LPUP.mat index cd282245f..94b984ac5 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/21 GREY-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/21 GREY-LIGHT-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 21 GREY-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/22 GREY-LIGHTEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/22 GREY-LIGHTEST-LPUP.mat index 5df12cd7e..6515a7d23 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/22 GREY-LIGHTEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/22 GREY-LIGHTEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 22 GREY-LIGHTEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/23 GREY-WHITE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/23 GREY-WHITE-LPUP.mat index aeb4ff286..7bf303e1f 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/23 GREY-WHITE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/23 GREY-WHITE-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 23 GREY-WHITE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/25 RED-DARKEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/25 RED-DARKEST-LPUP.mat index 4c29fc503..6296eb0b1 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/25 RED-DARKEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/25 RED-DARKEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 25 RED-DARKEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/26 RED-DARK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/26 RED-DARK-LPUP.mat index c5c9fe6f4..a9b44833f 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/26 RED-DARK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/26 RED-DARK-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 26 RED-DARK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/27 RED-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/27 RED-LPUP.mat index a14ac7740..f7fd658cd 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/27 RED-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/27 RED-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 27 RED-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/28 ORANGE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/28 ORANGE-LPUP.mat index 73f914050..63e44834e 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/28 ORANGE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/28 ORANGE-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 28 ORANGE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/29 ORANGE-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/29 ORANGE-LIGHT-LPUP.mat index ff8f1b500..5597a5069 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/29 ORANGE-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/29 ORANGE-LIGHT-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 29 ORANGE-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/3 SKIN-MEDIUM-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/3 SKIN-MEDIUM-LPUP.mat index c4453d77d..227dbefc3 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/3 SKIN-MEDIUM-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/3 SKIN-MEDIUM-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 3 SKIN-MEDIUM-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/30 YELLOW-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/30 YELLOW-LPUP.mat index 5002f7116..bae331c00 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/30 YELLOW-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/30 YELLOW-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 30 YELLOW-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/31 YELLOW-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/31 YELLOW-LIGHT-LPUP.mat index 152246948..8498e9080 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/31 YELLOW-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/31 YELLOW-LIGHT-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 31 YELLOW-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/33 GREEN-DARKEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/33 GREEN-DARKEST-LPUP.mat index 49f9fa297..b722a72a1 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/33 GREEN-DARKEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/33 GREEN-DARKEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 33 GREEN-DARKEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/34 GREEN-DARK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/34 GREEN-DARK-LPUP.mat index aab072616..1c3ef154c 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/34 GREEN-DARK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/34 GREEN-DARK-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 34 GREEN-DARK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/35 GREEN-MEDIUM-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/35 GREEN-MEDIUM-LPUP.mat index c1248b02a..1828d15c8 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/35 GREEN-MEDIUM-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/35 GREEN-MEDIUM-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 35 GREEN-MEDIUM-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/36 GREEN-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/36 GREEN-LPUP.mat index 5b1c7bb59..4cf9752cb 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/36 GREEN-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/36 GREEN-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 36 GREEN-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/37 GREEN-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/37 GREEN-LIGHT-LPUP.mat index c77e8bb59..96cf91335 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/37 GREEN-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/37 GREEN-LIGHT-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 37 GREEN-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/38 GREEN-LIGHTEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/38 GREEN-LIGHTEST-LPUP.mat index cf25311a7..0b497a1b0 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/38 GREEN-LIGHTEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/38 GREEN-LIGHTEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 38 GREEN-LIGHTEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/39 GREEN-WHITE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/39 GREEN-WHITE-LPUP.mat index 7a254c25a..04910ebeb 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/39 GREEN-WHITE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/39 GREEN-WHITE-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 39 GREEN-WHITE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/4 SKIN-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/4 SKIN-LPUP.mat index 12b592281..8fbed05b3 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/4 SKIN-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/4 SKIN-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 4 SKIN-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/41 BLUE-DARKEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/41 BLUE-DARKEST-LPUP.mat index 83565eb0a..23127c081 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/41 BLUE-DARKEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/41 BLUE-DARKEST-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 41 BLUE-DARKEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/42 BLUE-DARK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/42 BLUE-DARK-LPUP.mat index 6f5416a9a..e59dc3cfd 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/42 BLUE-DARK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/42 BLUE-DARK-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 42 BLUE-DARK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/43 BLUE-MEDIUM-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/43 BLUE-MEDIUM-LPUP.mat index 4d54b6e98..35c27b0c8 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/43 BLUE-MEDIUM-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/43 BLUE-MEDIUM-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 43 BLUE-MEDIUM-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/44 BLUE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/44 BLUE-LPUP.mat index 0f7507aa3..e0bd05f54 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/44 BLUE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/44 BLUE-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 44 BLUE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/45 BLUE-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/45 BLUE-LIGHT-LPUP.mat index 006623b94..24431927f 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/45 BLUE-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/45 BLUE-LIGHT-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 45 BLUE-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/46 BLUE-LIGHEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/46 BLUE-LIGHEST-LPUP.mat index 97307618e..52629f059 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/46 BLUE-LIGHEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/46 BLUE-LIGHEST-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 46 BLUE-LIGHEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/47 BLUE-WHITE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/47 BLUE-WHITE-LPUP.mat index 9784974d8..fba7f03f6 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/47 BLUE-WHITE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/47 BLUE-WHITE-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 47 BLUE-WHITE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/49 PINK-DARKEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/49 PINK-DARKEST-LPUP.mat index 7489801f0..a13f8e4df 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/49 PINK-DARKEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/49 PINK-DARKEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 49 PINK-DARKEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/5 SKIN-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/5 SKIN-LIGHT-LPUP.mat index ac2758a22..5261bad72 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/5 SKIN-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/5 SKIN-LIGHT-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 5 SKIN-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/50 PINK-DARK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/50 PINK-DARK-LPUP.mat index 104688501..6c314ad0d 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/50 PINK-DARK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/50 PINK-DARK-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 50 PINK-DARK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/51 PINK-MEDIUM-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/51 PINK-MEDIUM-LPUP.mat index 27a408654..f150d1a81 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/51 PINK-MEDIUM-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/51 PINK-MEDIUM-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 51 PINK-MEDIUM-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/52 PINK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/52 PINK-LPUP.mat index 48e154fd9..afe8b1b3d 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/52 PINK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/52 PINK-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 52 PINK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/53 PINK-LIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/53 PINK-LIGHT-LPUP.mat index 01bb982aa..e350df988 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/53 PINK-LIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/53 PINK-LIGHT-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 53 PINK-LIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/57 BLACK-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/57 BLACK-LPUP.mat index ace051cdc..1bbf31eed 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/57 BLACK-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/57 BLACK-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 57 BLACK-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/58 WHITE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/58 WHITE-LPUP.mat index 3c4c7e36c..105e2914f 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/58 WHITE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/58 WHITE-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 58 WHITE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/6 SKIN-LIGHTEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/6 SKIN-LIGHTEST-LPUP.mat index dc2755012..06cfae32c 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/6 SKIN-LIGHTEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/6 SKIN-LIGHTEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 6 SKIN-LIGHTEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-LPUP.mat index 0564c5e43..8ed802e8e 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-LPUP.mat @@ -21,18 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 64 GLASS-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-NIGHT-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-NIGHT-LPUP.mat index 5bd2dbc17..71e18675d 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-NIGHT-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/64 GLASS-NIGHT-LPUP.mat @@ -21,19 +21,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 64 GLASS-NIGHT-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _EMISSION - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/7 SKIN-WHITE-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/7 SKIN-WHITE-LPUP.mat index ce4c5f761..63cf7112b 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/7 SKIN-WHITE-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/7 SKIN-WHITE-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 7 SKIN-WHITE-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/9 BROWN-DARKEST-LPUP.mat b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/9 BROWN-DARKEST-LPUP.mat index 85a191cd4..9a27cab8f 100644 --- a/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/9 BROWN-DARKEST-LPUP.mat +++ b/BlueWater/Assets/polyperfect/Low Poly Ultimate Pack/- Materials/Colors/9 BROWN-DARKEST-LPUP.mat @@ -8,18 +8,21 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: 9 BROWN-DARKEST-LPUP - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _SPECULAR_SETUP - m_InvalidKeywords: [] + - DR_OUTLINE_ON + - _CELPRIMARYMODE_SINGLE + - _DETAILMAPBLENDINGMODE_MULTIPLY + - _TEXTUREBLENDINGMODE_MULTIPLY + m_InvalidKeywords: + - _UNITYSHADOWMODE_NONE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: diff --git a/BlueWater/ProjectSettings/ProjectSettings.asset b/BlueWater/ProjectSettings/ProjectSettings.asset index 77da37c71..879a1ceef 100644 --- a/BlueWater/ProjectSettings/ProjectSettings.asset +++ b/BlueWater/ProjectSettings/ProjectSettings.asset @@ -18,7 +18,7 @@ PlayerSettings: cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 m_SplashScreenLogoStyle: 1