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

2025-10-24 17:07:44 +02:00
parent 5f542525ba bd4e937e27
commit 3b1e52d150
40 changed files with 28621 additions and 11675 deletions
--- a/Assets/Meshes/Enviroment/Grove/Roots/Spiked_RootsDW.mat
+++ b/Assets/Meshes/Enviroment/Grove/Roots/Spiked_RootsDW.mat
@@ -133,12 +133,12 @@ Material:
    - _DstBlend: 0
    - _EffectThreshold: 0
    - _EnvironmentReflections: 1
-    - _FadeDistance: 0.55
-    - _FarFadeDistance: 200
+    - _FadeDistance: 0.87
+    - _FarFadeDistance: 20
    - _GlossMapScale: 0
    - _Glossiness: 0
    - _GlossyReflections: 0
-    - _InverseFadeRange: 1.49
+    - _InverseFadeRange: 0.57
    - _InverseFarFadeRange: 0.55
    - _Metallic: 0
    - _OcclusionStrength: 1
--- a/Assets/Meshes/Props/Mario_props/MATERIAL/Metal_Grill.mat
+++ b/Assets/Meshes/Props/Mario_props/MATERIAL/Metal_Grill.mat
@@ -29,17 +29,14 @@ Material:
  - BASETEXTYPE_ALBEDO_METALNESS
  - USEDISSOLVE_DONT_USE
  - _ALPHATEST_ON
-  - _SURFACE_TYPE_TRANSPARENT
-  - _USEDISTANCEFADE
  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: 2450
  stringTagMap:
-    RenderType: Transparent
+    RenderType: TransparentCutout
  disabledShaderPasses:
-  - DepthOnly
  - MOTIONVECTORS
  m_LockedProperties: 
  m_SavedProperties:
@@ -129,7 +126,7 @@ Material:
    - USEFRESNEL: 0
    - Vector1_473704f964214ae2bc68475022d1524b: 0
    - _AlphaClip: 1
-    - _AlphaToMask: 0
+    - _AlphaToMask: 1
    - _BendEffect: 0
    - _BendMaxDistance: 1
    - _BendMaxHeight: 0
@@ -145,7 +142,7 @@ Material:
    - _Cutoff: 0.5
    - _DetailAlbedoMapScale: 1
    - _DetailNormalMapScale: 1
-    - _DstBlend: 10
+    - _DstBlend: 0
    - _EffectThreshold: 0
    - _EnvironmentReflections: 1
    - _FadeDistance: 0.19
@@ -164,15 +161,15 @@ Material:
    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
-    - _SrcBlend: 5
-    - _Surface: 1
+    - _SrcBlend: 1
+    - _Surface: 0
    - _Threshold: 0
-    - _USEDISTANCEFADE: 1
+    - _USEDISTANCEFADE: 0
    - _USESCANWAVE: 0
    - _WaveTrail: 4
    - _WorkflowMode: 1
    - _ZTest: 4
-    - _ZWrite: 0
+    - _ZWrite: 1
    - _ZWriteControl: 0
    m_Colors:
    - BaseColor: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/Meshes/Props/Mario_props/MESHES/metal_addons/Metal_doorsB.fbx
+++ b/Assets/Meshes/Props/Mario_props/MESHES/metal_addons/Metal_doorsB.fbx
--- a/Assets/Meshes/Props/Mario_props/MESHES/metal_addons/Metal_doorsB.fbx.meta
+++ b/Assets/Meshes/Props/Mario_props/MESHES/metal_addons/Metal_doorsB.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 94424e7693c043e4d87d17445ab01cae
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Meshes/Props/Mario_props/PREFABS/Metal_Gate.prefab
+++ b/Assets/Meshes/Props/Mario_props/PREFABS/Metal_Gate.prefab
@@ -0,0 +1,208 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &417254225241807414
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1383827192761995393}
+  - component: {fileID: 2995592534547891367}
+  - component: {fileID: 4662415588319261705}
+  m_Layer: 0
+  m_Name: Metal_Gate
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1383827192761995393
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 417254225241807414}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
+  m_LocalPosition: {x: -95.944, y: 33.049225, z: 169.389}
+  m_LocalScale: {x: 1.2940886, y: 1.2940886, z: 1.2940886}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1440852149506372143}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &2995592534547891367
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 417254225241807414}
+  m_Mesh: {fileID: 2844951061842741664, guid: 94424e7693c043e4d87d17445ab01cae, type: 3}
+--- !u!23 &4662415588319261705
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 417254225241807414}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  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:
+  - {fileID: 2100000, guid: f6afe93c0be6baf43b9c61a8ab0681f4, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &763273299919347612
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5790164267625772439}
+  - component: {fileID: 9067710138801540365}
+  - component: {fileID: 1438982648102110781}
+  m_Layer: 0
+  m_Name: Metal_door
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5790164267625772439
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763273299919347612}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.0015819073, y: 1.2475545, z: -0.69545215}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1440852149506372143}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &9067710138801540365
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763273299919347612}
+  m_Mesh: {fileID: -1772748554472624543, guid: 94424e7693c043e4d87d17445ab01cae, type: 3}
+--- !u!23 &1438982648102110781
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 763273299919347612}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  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:
+  - {fileID: 2100000, guid: f6afe93c0be6baf43b9c61a8ab0681f4, type: 2}
+  - {fileID: 2100000, guid: b21000e73293ab8479edac8e5e4b2bdf, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &6014280860851346790
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1440852149506372143}
+  m_Layer: 0
+  m_Name: DOOR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1440852149506372143
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6014280860851346790}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.5071, y: 0.3782, z: -0.057}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5790164267625772439}
+  m_Father: {fileID: 1383827192761995393}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/Assets/Meshes/Props/Mario_props/PREFABS/Metal_Gate.prefab.meta
+++ b/Assets/Meshes/Props/Mario_props/PREFABS/Metal_Gate.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b4fcaabe3b5dcaa4e99b53b12ad77a01
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Meshes/Terrain/Terrain_Dark
+++ b/Assets/Meshes/Terrain/Terrain_Dark
--- a/Assets/Meshes/Terrain/Terrain_Land01_village.asset
+++ b/Assets/Meshes/Terrain/Terrain_Land01_village.asset