# Conflicts:
#	Assets/_Content/Models/Environments/BodiesInWater.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Materials.meta
#	Assets/_Content/Models/Environments/BodiesInWater/Shaders.meta
#	Assets/_Content/Models/Environments/HouseOfLeaves/Materials/M_houseOfLeaves_sand.mat
#	Packages/OctoCore/Runtime/Scripts/Components/OctoPlayer.cs
This commit is contained in:
2026-05-21 11:03:11 +01:00
65 changed files with 8287 additions and 742 deletions
+1 -1
View File
@@ -3182,7 +3182,7 @@ Light:
serializedVersion: 12
m_Type: 0
m_Color: {r: 0.5613208, g: 1, b: 0.94537294, a: 1}
m_Intensity: 500
m_Intensity: 300
m_Range: 30
m_SpotAngle: 179
m_InnerSpotAngle: 95.63957