marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
marcin
2025-03-17 08:54:57 +01:00
parent 69cf35b05d ccef3306f5
commit 158a861359
6 changed files with 1014 additions and 1667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Meshes/Characters/Giant/Materials_Giant/B_skin Giant02.mat
View File

@@ -126,7 +126,7 @@ Material:
- FresnelPower: 4
- Metalness: 3
- NormalStrength: 1.29
- Smoothness: 0.99
- Smoothness: 0.74
- USEDISSOLVE: 0
- USEDISSOLVEMASK: 0
- USEFRESNEL: 0
@@ -211,7 +211,7 @@ Material:
- BaseColor: {r: 0.3018868, g: 0.3018868, b: 0.3018868, a: 0}
- Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0}
- EmissiveColor: {r: 0, g: 0, b: 0, a: 0}
- _BaseColor: {r: 0.745283, g: 0.745283, b: 0.745283, a: 1}
- _BaseColor: {r: 0.3679245, g: 0.3679245, b: 0.3679245, a: 1}
- _BendVector: {r: 0, g: -1, b: 0, a: 0}
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _DistanceFade: {r: 398.00253, g: 0.01, b: 0, a: 0}

BIN
Assets/Meshes/Terrain/Terrain_Land01.asset
View File

Binary file not shown.

85
Assets/Prefabs/Environments/Rocks/Desert/LOCl_Rock.prefab
View File

@@ -25,12 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2519707779655214685}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8421440352589980069}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &6356280496268559224
MeshFilter:
@@ -57,6 +58,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -107,12 +111,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4074600211891592906}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8421440352589980069}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2506190912631661344
MeshFilter:
@@ -139,6 +144,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -189,12 +197,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4207697877916204065}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8421440352589980069}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2970009803926160159
MeshFilter:
@@ -221,6 +230,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -246,6 +258,69 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &9006523650409001523
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3933753499202510735}
- component: {fileID: 2399189285007394305}
- component: {fileID: 5771921385339961634}
m_Layer: 0
m_Name: Desert_small_Rock1_LOD2 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &3933753499202510735
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9006523650409001523}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: -0.014885712, y: 0.0001949358, z: -0.00063460827}
m_LocalScale: {x: 1.0972, y: 1.0972, z: 1.0972}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8421440352589980069}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2399189285007394305
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9006523650409001523}
m_Mesh: {fileID: 1890811075063134906, guid: cafe9bf11b797be44b0a7252af9a5722, type: 3}
--- !u!64 &5771921385339961634
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9006523650409001523}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 1890811075063134906, guid: cafe9bf11b797be44b0a7252af9a5722, type: 3}
--- !u!1 &9193297977177045791
GameObject:
m_ObjectHideFlags: 0
@@ -270,15 +345,17 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9193297977177045791}
serializedVersion: 2
m_LocalRotation: {x: 0.34875348, y: -0.6151188, z: -0.61511874, w: -0.34875336}
m_LocalPosition: {x: 187.74, y: -0.25, z: 156.33}
m_LocalScale: {x: 39.01208, y: 39.01208, z: 39.01208}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7878192976686150767}
- {fileID: 2204107433635107229}
- {fileID: 9214463681282361288}
- {fileID: 3933753499202510735}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: -239.104}
--- !u!205 &3640290346971862740
LODGroup:

2586
Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat vendored
View File

@@ -65,11 +65,11 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BlendOp: 2
- _BlendOp: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _DstBlend: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1

2
Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat vendored
View File

@@ -13,7 +13,7 @@ Material:
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _LIGHTSOURCE_POINT
- _LIGHTSOURCE_DIRECTIONAL
- _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4