iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#13 Remove redundant water materials, optimize Toon Water Material 2 and NavMesh settings, add new prefabs to main scene

Browse Source
This commit is contained in:
M1_IDMhan 2023-08-10 10:31:12 +09:00
parent b65931de1a
commit f47cabc061
13 changed files with 9490 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9659
BlueWater/Assets/01.Scenes/02.Main.unity
View File

File diff suppressed because it is too large Load Diff

BIN
BlueWater/Assets/01.Scenes/02.Main/NavMesh-Water Object.asset
View File

Binary file not shown.

135
BlueWater/Assets/03.Materials/Water/Toon Water Material 1.mat
View File

@ -1,135 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Toon Water Material 1
m_Shader: {fileID: -6465566751694194690, guid: b4a6b41e114133b4d8eb40ab1d879de6,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Texture2D_821B987A:
m_Texture: {fileID: 2800000, guid: ce0b76e65ef10314d9f55a9dd2284336, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Boolean_2918AA79: 0
- Vector1_20DB7652: 0.158
- Vector1_24CAEF48: 1
- Vector1_301E02E2: 240
- Vector1_31894ABB: 0.0158
- Vector1_3632ABA2: 0
- Vector1_45F25267: 1.14
- Vector1_738B39CF: 0
- Vector1_854A7D8C: 0.51
- Vector1_9C73072A: 0.88
- Vector1_A524D234: 0
- Vector1_B9CC1720: 0.03
- Vector1_E4F66A0: 0.03
- Vector1_E71BB35E: 1.02
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueControl: -1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- Color_1139F668: {r: 0.22241013, g: 0.80931354, b: 0.9622642, a: 0.5254902}
- Color_198818EE: {r: 0, g: 0.37919012, b: 1.498, a: 1}
- Color_626750DD: {r: 2, g: 2, b: 2, a: 1}
- Color_77A2EDE9: {r: 31.626795, g: 31.626795, b: 31.626795, a: 1}
- Vector2_1E1B6943: {r: 1, g: 5, b: 0, a: 0}
- Vector2_D06E76BC: {r: 0.1, g: 0.05, b: 0, a: 0}
- Vector2_D26C9C89: {r: 1, g: 0, b: 0, a: 0}
- Vector2_F678228C: {r: 0.5, g: 0.5, b: 0, a: 0}
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &3896513066879331790
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

8
BlueWater/Assets/03.Materials/Water/Toon Water Material 1.mat.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 7bd9197176b024eaf97d4007e256f419
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

6
BlueWater/Assets/03.Materials/Water/Toon Water Material 2.mat
View File

@ -74,7 +74,7 @@ Material:
- Vector1_20DB7652: 0.045
- Vector1_24CAEF48: 1
- Vector1_301E02E2: 512
- Vector1_31894ABB: 0.0066
- Vector1_31894ABB: 0.007
- Vector1_3632ABA2: 0.754
- Vector1_45F25267: 2.6
- Vector1_738B39CF: 0.018
@ -109,10 +109,10 @@ Material:
- _ZWrite: 1
m_Colors:
- Color_1139F668: {r: 1, g: 1, b: 1, a: 0.21176471}
- Color_198818EE: {r: 0, g: 1.2057794, b: 1.498, a: 0.16470589}
- Color_198818EE: {r: 0, g: 1.2057794, b: 1.498, a: 0.2}
- Color_626750DD: {r: 2, g: 2, b: 2, a: 1}
- Color_77A2EDE9: {r: 31.626795, g: 31.626795, b: 31.626795, a: 1}
- Vector2_1E1B6943: {r: 1, g: 5, b: 0, a: 0}
- Vector2_1E1B6943: {r: 1, g: 1, b: 0, a: 0}
- Vector2_D06E76BC: {r: 0.1, g: 0.05, b: 0, a: 0}
- Vector2_D26C9C89: {r: 1, g: 0, b: 0, a: 0}
- Vector2_F678228C: {r: 0.5, g: 0.5, b: 0, a: 0}

135
BlueWater/Assets/03.Materials/Water/Toon Water Material 3.mat
View File

@ -1,135 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Toon Water Material 3
m_Shader: {fileID: -6465566751694194690, guid: b4a6b41e114133b4d8eb40ab1d879de6,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Texture2D_821B987A:
m_Texture: {fileID: 2800000, guid: ce0b76e65ef10314d9f55a9dd2284336, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Boolean_2918AA79: 1
- Vector1_20DB7652: 0.261
- Vector1_24CAEF48: 1
- Vector1_301E02E2: 240
- Vector1_31894ABB: 0.009
- Vector1_3632ABA2: 0
- Vector1_45F25267: 1.14
- Vector1_738B39CF: 0
- Vector1_854A7D8C: 0.93
- Vector1_9C73072A: 0.97
- Vector1_A524D234: 0
- Vector1_B9CC1720: 0.03
- Vector1_E4F66A0: 0.03
- Vector1_E71BB35E: 1.02
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueControl: -1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- Color_1139F668: {r: 0.25143114, g: 1.7815307, b: 2.1828797, a: 1}
- Color_198818EE: {r: 0, g: 0.34509805, b: 1.4980392, a: 0.92156863}
- Color_626750DD: {r: 2, g: 2, b: 2, a: 1}
- Color_77A2EDE9: {r: 31.626795, g: 31.626795, b: 31.626795, a: 1}
- Vector2_1E1B6943: {r: 1, g: 5, b: 0, a: 0}
- Vector2_D06E76BC: {r: 0.1, g: 0.05, b: 0, a: 0}
- Vector2_D26C9C89: {r: 1, g: 0, b: 0, a: 0}
- Vector2_F678228C: {r: 0.5, g: 0.5, b: 0, a: 0}
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &3896513066879331790
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

8
BlueWater/Assets/03.Materials/Water/Toon Water Material 3.mat.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 16389c65bfffc47ad8a950b00cf3642e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

144
BlueWater/Assets/03.Materials/Water/Toon Water Mobile Fast.mat
View File

@ -1,144 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Toon Water Mobile Fast
m_Shader: {fileID: -6465566751694194690, guid: 550017bf155e702489e4eee4d320ebeb,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- Texture2D_662AC62F:
m_Texture: {fileID: 2800000, guid: e0e8561a19db1b841b346944d8b13461, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_A0A6C9A8:
m_Texture: {fileID: 2800000, guid: e1301069de86bdd439c7a3182ed21c3c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- Texture2D_CC12F70E:
m_Texture: {fileID: 2800000, guid: e1301069de86bdd439c7a3182ed21c3c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- BOOLEAN_537AC313: 0
- BOOLEAN_765B4C2: 0
- BOOLEAN_A060AF44: 0
- BOOLEAN_EC1EAD31: 0
- Boolean_2918AA79: 0
- Vector1_20DB7652: 0.157
- Vector1_301E02E2: 200
- Vector1_31894ABB: 0.0485
- Vector1_45F25267: 2.36
- Vector1_7AF1AC78: 0.964
- Vector1_854A7D8C: 0.9
- Vector1_9C73072A: 0
- Vector1_A524D234: 0.288
- Vector1_B9CC1720: 0.0319
- Vector1_E71BB35E: 1
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _Cull: 2
- _Cutoff: 0.5
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- Color_1139F668: {r: 0, g: 0.5380234, b: 0.83, a: 0.5803922}
- Color_198818EE: {r: 0.35279235, g: 0.9320378, b: 0.95699996, a: 0.9490196}
- Color_626750DD: {r: 2, g: 2, b: 2, a: 1}
- Color_77A2EDE9: {r: 0.8947124, g: 0.8947124, b: 0.8947124, a: 1}
- Vector2_1E1B6943: {r: 0.1, g: 0.5, b: 0, a: 0}
- Vector2_D06E76BC: {r: 0.1, g: 0.05, b: 0, a: 0}
- Vector2_D26C9C89: {r: 0.03, g: 0, b: 0, a: 0}
- Vector2_F678228C: {r: 0.5, g: 0.5, b: 0, a: 0}
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &5467701122665808439
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

8
BlueWater/Assets/03.Materials/Water/Toon Water Mobile.mat.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 6f699adcfa13e46909b0be2a19b8c536
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

12
BlueWater/Assets/03.Materials/Water/Toon Water Mobile.mat → BlueWater/Assets/03.Materials/Water/Toon Water.mat
View File

@ -7,15 +7,15 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Toon Water Mobile
m_Shader: {fileID: -6465566751694194690, guid: 550017bf155e702489e4eee4d320ebeb,
m_Name: Toon Water
m_Shader: {fileID: -6465566751694194690, guid: b4a6b41e114133b4d8eb40ab1d879de6,
type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
m_ValidKeywords: []
m_InvalidKeywords:
- BOOLEAN_A060AF44_ON
- BOOLEAN_EC1EAD31_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -120,7 +120,9 @@ Material:
- Vector1_20DB7652: 0.157
- Vector1_301E02E2: 200
- Vector1_31894ABB: 0.0485
- Vector1_3632ABA2: 0
- Vector1_45F25267: 30.88
- Vector1_738B39CF: 0
- Vector1_7AF1AC78: 0.97
- Vector1_854A7D8C: 0.9
- Vector1_9C73072A: 0.04
@ -257,7 +259,7 @@ Material:
- _ZWrite: 0
m_Colors:
- Color_1139F668: {r: 0, g: 0.6439421, b: 0.9921569, a: 0.38431373}
- Color_198818EE: {r: 0.341151, g: 0.5477178, b: 0.9245283, a: 0.8862745}
- Color_198818EE: {r: 0.341151, g: 0.5477178, b: 0.9245283, a: 0.79607844}
- Color_626750DD: {r: 2, g: 2, b: 2, a: 1}
- Color_77A2EDE9: {r: 32, g: 32, b: 32, a: 1}
- Vector2_1E1B6943: {r: 0, g: 0, b: 0, a: 0}

2
BlueWater/Assets/03.Materials/Water/Toon Water Mobile Fast.mat.meta → BlueWater/Assets/03.Materials/Water/Toon Water.mat.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 29fa0c27fe8a743499f21102d679ba40
guid: ef458611993c84104a5d6ec4672c5f2e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

2
BlueWater/ProjectSettings/DynamicsManager.asset
View File

@ -18,7 +18,7 @@ PhysicsManager:
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_ContactsGeneration: 1
m_LayerCollisionMatrix: 0000000000000000000000000007000000000000000000000000000000000000080700000807000008070000001000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
m_LayerCollisionMatrix: 100000001000000010000000100700001f000000000000000000000000000000080700000807000008070000001000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
m_SimulationMode: 0
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 0

2
BlueWater/ProjectSettings/NavMeshAreas.asset
View File

@ -93,7 +93,7 @@ NavMeshProjectSettings:
agentTypeID: -1372625422
agentRadius: 0.5
agentHeight: 0.2
agentSlope: 0
agentSlope: 10
agentClimb: 0.1
ledgeDropHeight: 0
maxJumpAcrossDistance: 0