Merge pull request #160 from dongcheolpark/develop

feature : 물기 패턴 추가
GAMPOT-DEV · Sep 1, 2022 · d0a0dcd · d0a0dcd
2 parents 9c915fe + 2fa66a6
commit d0a0dcd
Show file tree

Hide file tree

Showing 21 changed files with 16,514 additions and 7,274 deletions.
diff --git a/Project_Blind/Assets/Art/Animations/Animator/Enemy/몽둥이 산적_Controller.controller b/Project_Blind/Assets/Art/Animations/Animator/Enemy/몽둥이 산적_Controller.controller
diff --git a/Project_Blind/Assets/Art/Animations/Animator/Enemy/몽둥이 산적_Controller.controller.meta b/Project_Blind/Assets/Art/Animations/Animator/Enemy/몽둥이 산적_Controller.controller.meta
diff --git a/Project_Blind/Assets/Resources/Art/Enemy/몽둥이 산적_Material.mat b/Project_Blind/Assets/Resources/Art/Enemy/몽둥이 산적_Material.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: "\uBABD\uB465\uC774 \uC0B0\uC801_Material"
-  m_Shader: {fileID: 4800000, guid: 1e8a610c9e01c3648bac42585e5fc676, type: 3}
+  m_Shader: {fileID: 4800000, guid: f1524bf0f9654ed7af907865dfed7fa2, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords:
   - _USE8NEIGHBOURHOOD_ON
@@ -21,22 +21,41 @@ Material:
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 77dcf05df60ef94479e7070870d29d2e, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _MaskTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
     - _Cutoff: 0.1
+    - _DoubleSidedLighting: 0
+    - _EnableExternalAlpha: 0
+    - _Outline: 0
     - _OutlineMipLevel: 0
     - _OutlineReferenceTexWidth: 1024
     - _OutlineSmoothness: 1
     - _OutlineWidth: 3
+    - _ShowInShadow: 0
     - _StencilComp: 8
     - _StencilRef: 1
     - _StraightAlphaInput: 0
     - _ThresholdEnd: 0.25
     - _Use8Neighbourhood: 1
     m_Colors:
-    - _OutlineColor: {r: 1, g: 1, b: 0, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
diff --git a/Project_Blind/Assets/Resources/Prefabs/BasicPrefabs/Cameras.prefab b/Project_Blind/Assets/Resources/Prefabs/BasicPrefabs/Cameras.prefab
@@ -484,7 +484,7 @@ MonoBehaviour:
     GateFit: 2
     m_SensorSize: {x: 2.0981662, y: 1}
   m_Transitions:
-    m_BlendHint: 0
+    m_BlendHint: 1
     m_InheritPosition: 0
     m_OnCameraLive:
       m_PersistentCalls: