Merge branch 'NewStory' of http://185.56.209.148/beyond/beyond into NewStory

2025-08-08 15:24:40 +02:00
parent 5bbd627f95 af3d717ef1
commit 46b6c5dd9a
5 changed files with 2689 additions and 5167 deletions
--- a/Assets/Meshes/Terrain/Terrain_Land01.asset
+++ b/Assets/Meshes/Terrain/Terrain_Land01.asset
--- a/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity
+++ b/Assets/Scenes/Land_01/demo_postptrocesINTRO.unity
--- a/Assets/ThirdParty/CHARACTERS/Bird
+++ b/Assets/ThirdParty/CHARACTERS/Bird
@@ -13,6 +13,7 @@ Material:
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
  - _ALPHATEST_ON
+  - _EMISSION
  m_InvalidKeywords: []
  m_LightmapFlags: 6
  m_EnableInstancingVariants: 0
--- a/Assets/ThirdParty/CHARACTERS/HerdSim/Animal
+++ b/Assets/ThirdParty/CHARACTERS/HerdSim/Animal
@@ -11,7 +11,8 @@ Material:
  m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _EMISSION
  m_InvalidKeywords: []
  m_LightmapFlags: 6
  m_EnableInstancingVariants: 0
--- a/Assets/ThirdParty/ENVIRO/Top-Down
+++ b/Assets/ThirdParty/ENVIRO/Top-Down
@@ -12,6 +12,7 @@ Material:
  m_Parent: {fileID: 0}
  m_ModifiedSerializedProperties: 0
  m_ValidKeywords:
+  - _EMISSION
  - _NORMALMAP
  m_InvalidKeywords: []
  m_LightmapFlags: 6