메터리얼 색깔 입력, 테스트 씬 수정

2023-08-03 14:50:08 +09:00 · 2023-08-03 14:50:08 +09:00 · e22ac739d1
commit e22ac739d1
parent 3973258f79
12 changed files with 999 additions and 632 deletions
--- a/BlueWater/Assets/01.Scenes/02.Main_SJ.unity
+++ b/BlueWater/Assets/01.Scenes/02.Main_SJ.unity
--- a/BlueWater/Assets/02.Scripts/BlueWater.cs
+++ b/BlueWater/Assets/02.Scripts/BlueWater.cs
@ -2,7 +2,7 @@
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
 //     version 1.6.3
-//     from Assets/02.Scritps/BlueWater.inputactions
+//     from Assets/02.Scripts/BlueWater.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
--- a/BlueWater/Assets/03.Materials/TestRoof_SJ.mat
+++ b/BlueWater/Assets/03.Materials/TestRoof_SJ.mat
@ -25,6 +25,7 @@ Material:
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
+  - DR_OUTLINE_ON
  - _DETAILMAPBLENDINGMODE_MULTIPLY
  - _TEXTUREBLENDINGMODE_MULTIPLY
  m_InvalidKeywords: []
@ -34,8 +35,7 @@ Material:
  m_CustomRenderQueue: 2000
  stringTagMap:
    RenderType: Opaque
-  disabledShaderPasses:
-  - SRPDEFAULTUNLIT
+  disabledShaderPasses: []
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
@ -146,9 +146,9 @@ Material:
    - _Metallic: 0
    - _OcclusionStrength: 1
    - _OutlineDepthOffset: 0
-    - _OutlineEnabled: 0
+    - _OutlineEnabled: 1
    - _OutlineScale: 1
-    - _OutlineWidth: 1
+    - _OutlineWidth: 1.5
    - _OverrideBakedGi: 0
    - _OverrideLightAttenuation: 0
    - _OverrideLightmapDir: 0
@ -156,7 +156,7 @@ Material:
    - _QueueOffset: 0
    - _ReceiveShadows: 1
    - _RimEnabled: 0
-    - _SelfShadingSize: 0.294
+    - _SelfShadingSize: 0.24
    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularEnabled: 0
@ -180,7 +180,7 @@ Material:
    - _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
    - _LightAttenuation: {r: 0, g: 1, b: 0, a: 0}
    - _LightmapDirection: {r: 0, g: 1, b: 0, a: 0}
-    - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 0.03773582, g: 0.036489826, b: 0.036489826, a: 1}
    - _ShadowColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
@ -190,7 +190,7 @@ Texture2D:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: z__GradientRampTex{"mode":1,"colorKeys":[{"color":{"r":0.14901961386203767,"g":0.27450981736183169,"b":0.32549020648002627,"a":1.0},"time":0.18236057460308076},{"color":{"r":0.16470588743686677,"g":0.615686297416687,"b":0.5607843399047852,"a":1.0},"time":0.364705890417099},{"color":{"r":0.9137254953384399,"g":0.7686274647712708,"b":0.4156862795352936,"a":1.0},"time":0.5647059082984924},{"color":{"r":0.95686274766922,"g":0.6352941393852234,"b":0.3803921639919281,"a":1.0},"time":0.7823605537414551},{"color":{"r":0.9058823585510254,"g":0.43529412150382998,"b":0.3176470696926117,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":1.0,"time":0.0},{"alpha":1.0,"time":1.0}]}
+  m_Name: z__GradientRampTex{"mode":1,"colorKeys":[{"color":{"r":0.07450980693101883,"g":0.16470588743686677,"b":0.07450980693101883,"a":1.0},"time":0.13235676288604737},{"color":{"r":0.9960784316062927,"g":0.49803921580314639,"b":0.1764705926179886,"a":1.0},"time":0.32646676898002627},{"color":{"r":0.9882352948188782,"g":0.7921568751335144,"b":0.27450981736183169,"a":1.0},"time":0.5323567390441895},{"color":{"r":0.6313725709915161,"g":0.7568627595901489,"b":0.5058823823928833,"a":1.0},"time":0.7794156074523926},{"color":{"r":0.3803921639919281,"g":0.6078431606292725,"b":0.5411764979362488,"a":1.0},"time":1.0}],"alphaKeys":[{"alpha":1.0,"time":0.0},{"alpha":1.0,"time":1.0}]}
  m_ImageContentsHash:
    serializedVersion: 2
    Hash: 00000000000000000000000000000000
@ -226,7 +226,7 @@ Texture2D:
  m_ColorSpace: 1
  m_PlatformBlob: 
  image data: 1024
-  _typelessdata: ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff264653ff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fff2a9d8fffe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46affe9c46afff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261fff4a261ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51ffe76f51
+  _typelessdata: ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13ff132a13fffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffe7f2dfffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46fffcca46ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ffa1c181ff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8aff619b8a
  m_StreamData:
    serializedVersion: 2
    offset: 0
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b044a2387a61dac41bdf204adffdce9d
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cd287c84e887ea24a8679e67aac7c074
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f211254f5bfad224ba88868f2c75432c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta
+++ b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4368c9be31b3c174dbfd80f2caf98889
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Coast/5_Materials/MAT_FALLBACK_WATER.mat
+++ b/Coast/5_Materials/MAT_FALLBACK_WATER.mat
@ -13,6 +13,7 @@ Material:
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
  - _EMISSION
+  - _ENVIRONMENTREFLECTIONS_OFF
  m_InvalidKeywords:
  - _GLOSSYREFLECTIONS_OFF
  m_LightmapFlags: 1
@ -56,7 +57,7 @@ Material:
        m_Offset: {x: 0, y: 0}
    - _MainTex:
        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
+        m_Scale: {x: 50, y: 50}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
        m_Texture: {fileID: 0}
@ -124,7 +125,7 @@ Material:
    m_Colors:
    - WaveSpeed: {r: 19, g: 9, b: -16, a: -7}
    - _BaseColor: {r: 0.28301886, g: 0.77970785, b: 1, a: 0.653}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.28301883, g: 0.77970785, b: 1, a: 0.653}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
    - _horizonColor: {r: 0.17199998, g: 0.463, b: 0.39887586, a: 0.378}
--- a/Coast/5_Materials/MAT_GLASS.mat
+++ b/Coast/5_Materials/MAT_GLASS.mat
@ -35,6 +35,7 @@ Material:
    RenderType: Transparent
  disabledShaderPasses:
  - DepthOnly
+  - SHADOWCASTER
  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
@ -131,7 +132,7 @@ Material:
    - _ZWrite: 0
    m_Colors:
    - _BaseColor: {r: 0.33823523, g: 0.33823523, b: 0.33823523, a: 0.4509804}
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.3382352, g: 0.3382352, b: 0.3382352, a: 0.4509804}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
  m_BuildTextureStacks: []
--- a/Coast/5_Materials/MAT_WOOD_FLOOR.mat
+++ b/Coast/5_Materials/MAT_WOOD_FLOOR.mat
@ -52,7 +52,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 4ca107a801797994ea3739663b95807f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
--- a/Coast/5_Materials/MAT_WOOD_WALL.mat
+++ b/Coast/5_Materials/MAT_WOOD_WALL.mat
@ -65,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: 77e271d858467254d901931427331482, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap: