Merge pull request #53 from Andre-LA/master

atualizado para 2020.1.16f1
unimonte-games · Dec 4, 2020 · 74eb571 · 74eb571
2 parents 027d3f8 + ecd7b64
commit 74eb571
Show file tree

Hide file tree

Showing 20 changed files with 1,065 additions and 291 deletions.
diff --git a/Assets/ForwardRenderer.asset b/Assets/ForwardRenderer.asset
@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
+  m_Name: ForwardRenderer
+  m_EditorClassIdentifier: 
+  m_RendererFeatures: []
+  m_RendererFeatureMap: 
+  postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  shaders:
+    blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
+    copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}
+    screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
+      type: 3}
+    samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
+    fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
+  m_OpaqueLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_TransparentLayerMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_DefaultStencilState:
+    overrideStencilState: 0
+    stencilReference: 0
+    stencilCompareFunction: 8
+    passOperation: 0
+    failOperation: 0
+    zFailOperation: 0
+  m_ShadowTransparentReceive: 1
diff --git a/Assets/ForwardRenderer.asset.meta b/Assets/ForwardRenderer.asset.meta
diff --git a/Assets/LWRP_Asset.asset b/Assets/LWRP_Asset.asset
@@ -12,12 +12,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
   m_Name: LWRP_Asset
   m_EditorClassIdentifier: 
-  k_AssetVersion: 4
+  k_AssetVersion: 5
+  k_AssetPreviousVersion: 5
   m_RendererType: 1
-  m_RendererData: {fileID: 11400000, guid: 618d298269e66c542b306de85db1faea, type: 2}
+  m_RendererData: {fileID: 0}
+  m_RendererDataList:
+  - {fileID: 11400000, guid: 0fc1b6e20fe13614a938c570c1164a81, type: 2}
+  m_DefaultRendererIndex: 0
   m_RequireDepthTexture: 0
   m_RequireOpaqueTexture: 0
   m_OpaqueDownsampling: 1
+  m_SupportsTerrainHoles: 1
   m_SupportsHDR: 0
   m_MSAA: 1
   m_RenderScale: 1
@@ -38,6 +43,10 @@ MonoBehaviour:
   m_UseSRPBatcher: 1
   m_SupportsDynamicBatching: 0
   m_MixedLightingSupported: 1
+  m_DebugLevel: 0
+  m_UseAdaptivePerformance: 1
+  m_ColorGradingMode: 0
+  m_ColorGradingLutSize: 32
   m_ShadowType: 1
   m_LocalShadowsSupported: 0
   m_LocalShadowsAtlasResolution: 256

diff --git a/Assets/materiais/mat agua.mat b/Assets/materiais/mat agua.mat
@@ -95,7 +95,8 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
-    - _altura_mul: {r: 0, g: 0, b: 0, a: 1}
+    - _altura_mul: {r: 0, g: 0, b: 13, a: 1}
     - _color_1: {r: 0.25787643, g: 0.6060673, b: 0.8962264, a: 1}
     - _color_2: {r: 0.3457636, g: 0.697474, b: 0.990566, a: 1}
     - _desloca_mul: {r: 0.1, g: 0.1, b: 0, a: 0}
+  m_BuildTextureStacks: []
diff --git a/Assets/materiais/mat debug.mat b/Assets/materiais/mat debug.mat
@@ -13,7 +13,7 @@ Material:
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2050
+  m_CustomRenderQueue: 2000
   stringTagMap:
     RenderType: Opaque
   disabledShaderPasses: []
@@ -75,6 +75,7 @@ Material:
     - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
 --- !u!114 &1097513987470280316
 MonoBehaviour:
   m_ObjectHideFlags: 11
@@ -87,4 +88,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 1
+  version: 2
diff --git a/Assets/materiais/slimes/mat-gatinha.mat b/Assets/materiais/slimes/mat-gatinha.mat
@@ -98,3 +98,4 @@ Material:
     - _light_dir: {r: 0.3213938, g: 0.7660445, b: -0.5566704, a: 0}
     - _main_color: {r: 1, g: 1, b: 1, a: 0}
     - _outline_color: {r: 1, g: 1, b: 1, a: 0}
+  m_BuildTextureStacks: []
diff --git a/Assets/prefabs/slimes/gatinha.prefab b/Assets/prefabs/slimes/gatinha.prefab
@@ -35,6 +35,11 @@ PrefabInstance:
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 9100000, guid: a1f1580f9ab30cdb497867cd66865847, type: 2}
+    - target: {fileID: -4216859302048453862, guid: ba39c5a970c90bb1fa36e549a1dc4e13,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: ba39c5a970c90bb1fa36e549a1dc4e13,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -50,6 +55,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -4216859302048453862, guid: ba39c5a970c90bb1fa36e549a1dc4e13,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: ba39c5a970c90bb1fa36e549a1dc4e13,
         type: 3}
       propertyPath: m_LocalRotation.x
@@ -65,16 +75,6 @@ PrefabInstance:
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: ba39c5a970c90bb1fa36e549a1dc4e13,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: ba39c5a970c90bb1fa36e549a1dc4e13,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: ba39c5a970c90bb1fa36e549a1dc4e13,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -128,6 +128,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -145,27 +150,22 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,
         type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
+      propertyPath: m_LocalRotation.w
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,
         type: 3}
-      propertyPath: m_LocalRotation.y
+      propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,
         type: 3}
-      propertyPath: m_LocalRotation.z
+      propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,
         type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,
-        type: 3}
-      propertyPath: m_RootOrder
+      propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3461466182957116214, guid: 500832dbed26efb428a590f03527603c,