From 62b2dfa7706a2bd6e14d549274f08acd92e342ae Mon Sep 17 00:00:00 2001 From: szczuras4 Date: Fri, 2 May 2025 22:19:32 +0200 Subject: [PATCH] VO Bay Vista cut scene --- .../CH02/CUT_SCENE_RIVER_BayVista.playable | 399 ++ .../CUT_SCENE_RIVER_BayVista.playable.meta | 8 + .../CUT_SCENE_RIVER_TriggerTimeline.playable | 483 ++ ..._SCENE_RIVER_TriggerTimeline.playable.meta | 8 + Assets/Dialogue/TestDialogueBase.asset | 389 ++ .../Terrain/Terrain_Land01_village.asset | Bin 6378812 -> 6378812 bytes .../Environments/Nature/GreenEgg.prefab | 95 - Assets/SavedRiverMesh_RamSpline_2.asset | 167 + Assets/SavedRiverMesh_RamSpline_2.asset.meta | 8 + .../Land_of_Death_River1_Valley02.unity | 4638 +++++++++++------ .../River/Materials Offset/GreenRiver.mat | 388 ++ .../Materials Offset/GreenRiver.mat.meta | 8 + .../River/Materials Offset/Red_river.mat | 10 +- .../Scripts/Editor/RamSaveMeshEditor.cs | 35 + .../Scripts/Editor/RamSaveMeshEditor.cs.meta | 2 + .../Scripts/RiverColorChanger.cs | 47 + .../Scripts/RiverColorChanger.cs.meta | 2 + .../Spline System/Scripts/RiverColorVolume.cs | 54 + .../Scripts/RiverColorVolume.cs.meta | 2 + .../Materials/Effect26/DecalBottom 1.mat | 4 + .../Materials/Effect26/DecalBottom 4.mat | 126 + .../Materials/Effect26/DecalBottom 4.mat.meta | 8 + Assets/testy/Marcin/TesttRenderer.asset | 2 +- 23 files changed, 5073 insertions(+), 1810 deletions(-) create mode 100644 Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable create mode 100644 Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable.meta create mode 100644 Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable create mode 100644 Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable.meta create mode 100644 Assets/SavedRiverMesh_RamSpline_2.asset create mode 100644 Assets/SavedRiverMesh_RamSpline_2.asset.meta create mode 100644 Assets/ThirdParty/NatureManufacture Assets/River Auto Material/River/Materials Offset/GreenRiver.mat create mode 100644 Assets/ThirdParty/NatureManufacture Assets/River Auto Material/River/Materials Offset/GreenRiver.mat.meta create mode 100644 Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/Editor/RamSaveMeshEditor.cs create mode 100644 Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/Editor/RamSaveMeshEditor.cs.meta create mode 100644 Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs create mode 100644 Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs.meta create mode 100644 Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs create mode 100644 Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs.meta create mode 100644 Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat create mode 100644 Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat.meta diff --git a/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable new file mode 100644 index 000000000..0dab05cc7 --- /dev/null +++ b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable @@ -0,0 +1,399 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5643642079877698651 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: -34.985565, y: 37.59982, z: 120.22835} + m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: 3313876041999580923} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 +--- !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: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: CUT_SCENE_RIVER_BayVista + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: -5643642079877698651} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!74 &3313876041999580923 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -3.438, y: 39.701, z: -0.155} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 8.766666 + value: {x: -0.86, y: 51.211, z: -0.156} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 8.766666 + value: {x: 23.402584, y: -0.45389557, z: 17.61325} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 8.766666 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -3.438 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8.766666 + value: -0.86 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 39.701 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8.766666 + value: 51.211 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.155 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8.766666 + value: -0.156 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 4 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8.766666 + value: 23.402584 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8.766666 + value: -0.45389557 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 8.766666 + value: 17.61325 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable.meta b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable.meta new file mode 100644 index 000000000..0e746ec97 --- /dev/null +++ b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_BayVista.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 566d7220d46fd054eb1ad64cb562ab51 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable new file mode 100644 index 000000000..517be28df --- /dev/null +++ b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable @@ -0,0 +1,483 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &-8962237514471478041 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Recorded + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.007494483, y: 0.34371436, z: 0.0013586581, w: 0.9390434} + inSlope: {x: 0, y: 0, z: 0, w: 0} + outSlope: {x: 0.000006364391, y: 0.000057024947, z: -0.0000018774954, w: -0.00001629284} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334, w: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334, w: 0.33333334} + - serializedVersion: 3 + time: 7.3166666 + value: {x: 0.0073083905, y: 0.4735718, z: -0.0054059965, w: 0.88070834} + inSlope: {x: 0.000005155157, y: 0.000048878526, z: -0.0000033731274, w: -0.000024439263} + outSlope: {x: 0, y: 0, z: 0, w: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334, w: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334, w: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 7.3166666 + value: {x: 19.086128, y: 0.26073837, z: 20.979095} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 7.3166666 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 19.086128 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 0.26073837 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 20.979095 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.007494483 + inSlope: 0 + outSlope: 0.000006364391 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 0.0073083905 + inSlope: 0.000005155157 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalRotation.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.34371436 + inSlope: 0 + outSlope: 0.000057024947 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 0.4735718 + inSlope: 0.000048878526 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalRotation.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.0013586581 + inSlope: 0 + outSlope: -0.0000018774954 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: -0.0054059965 + inSlope: -0.0000033731274 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalRotation.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9390434 + inSlope: 0 + outSlope: -0.00001629284 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 0.88070834 + inSlope: -0.000024439263 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalRotation.w + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.86 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 1.031 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAngles.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 40.209 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: 56.534 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAngles.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.149 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 7.3166666 + value: -0.149 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAngles.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !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: bfda56da833e2384a9677cd3c976a436, type: 3} + m_Name: CUT_SCENE_RIVER_TriggerTimeline + m_EditorClassIdentifier: + m_Version: 0 + m_Tracks: + - {fileID: 7204271054927332392} + m_FixedDuration: 0 + m_EditorSettings: + m_Framerate: 60 + m_ScenePreview: 1 + m_DurationMode: 0 + m_MarkerTrack: {fileID: 0} +--- !u!114 &7204271054927332392 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: d21dcc2386d650c4597f3633c75a1f98, type: 3} + m_Name: Animation Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: [] + m_Markers: + m_Objects: [] + m_InfiniteClipPreExtrapolation: 1 + m_InfiniteClipPostExtrapolation: 1 + m_InfiniteClipOffsetPosition: {x: -37.7941, y: 37.3072, z: 115.85808} + m_InfiniteClipOffsetEulerAngles: {x: -0, y: 0, z: 0} + m_InfiniteClipTimeOffset: 0 + m_InfiniteClipRemoveOffset: 0 + m_InfiniteClipApplyFootIK: 1 + mInfiniteClipLoop: 0 + m_MatchTargetFields: 63 + m_Position: {x: 0, y: 0, z: 0} + m_EulerAngles: {x: 0, y: 0, z: 0} + m_AvatarMask: {fileID: 0} + m_ApplyAvatarMask: 1 + m_TrackOffset: 0 + m_InfiniteClip: {fileID: -8962237514471478041} + m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1} + m_Rotation: {x: 0, y: 0, z: 0, w: 1} + m_ApplyOffsets: 0 diff --git a/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable.meta b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable.meta new file mode 100644 index 000000000..34196bd1b --- /dev/null +++ b/Assets/Animations/CUT_SCENES/CH02/CUT_SCENE_RIVER_TriggerTimeline.playable.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 322f1db436cd6bc44af0b6475ed3cb87 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Dialogue/TestDialogueBase.asset b/Assets/Dialogue/TestDialogueBase.asset index 00e6d006d..68152ec93 100644 --- a/Assets/Dialogue/TestDialogueBase.asset +++ b/Assets/Dialogue/TestDialogueBase.asset @@ -24379,6 +24379,395 @@ MonoBehaviour: height: 30 canvasScrollPosition: {x: 0, y: 0} canvasZoom: 1 + - id: 97 + fields: + - title: Title + value: CH02/RUINEDTOWN/CH02_vo_bay_wanderer_00 + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Parenthetical + value: + type: 0 + typeString: + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 97 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 97 + originDialogueID: 0 + destinationConversationID: 97 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 30 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: If I'm very careful, I should be able to get to that wrecked boat + on the other side... + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 97 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 + - id: 98 + fields: + - title: Title + value: CH02/RUINEDTOWN/CH02_cs_bayvista_sword_00 + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + overrideSettings: + useOverrides: 0 + overrideSubtitleSettings: 0 + showNPCSubtitlesDuringLine: 1 + showNPCSubtitlesWithResponses: 1 + showPCSubtitlesDuringLine: 0 + skipPCSubtitleAfterResponseMenu: 0 + subtitleCharsPerSecond: 30 + minSubtitleSeconds: 2 + continueButton: 0 + overrideSequenceSettings: 0 + defaultSequence: + defaultPlayerSequence: + defaultResponseMenuSequence: + overrideInputSettings: 0 + alwaysForceResponseMenu: 1 + includeInvalidEntries: 0 + responseTimeout: 0 + cancelSubtitle: + key: 27 + buttonName: + cancelConversation: + key: 27 + buttonName: + nodeColor: + dialogueEntries: + - id: 0 + fields: + - title: Title + value: START + type: 0 + typeString: + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: + - title: Actor + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: + - title: Dialogue Text + value: + type: 0 + typeString: + - title: Parenthetical + value: + type: 0 + typeString: + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: + - title: Sequence + value: None() + type: 0 + typeString: + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 98 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: + conditionPriority: 2 + outgoingLinks: + - originConversationID: 98 + originDialogueID: 0 + destinationConversationID: 98 + destinationDialogueID: 1 + isConnector: 0 + priority: 2 + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 30 + width: 160 + height: 30 + - id: 1 + fields: + - title: Title + value: + type: 0 + typeString: CustomFieldType_Text + - title: Pictures + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Description + value: + type: 0 + typeString: CustomFieldType_Text + - title: Actor + value: 2 + type: 5 + typeString: CustomFieldType_Actor + - title: Conversant + value: 1 + type: 5 + typeString: CustomFieldType_Actor + - title: Menu Text + value: + type: 0 + typeString: CustomFieldType_Text + - title: Dialogue Text + value: You'll find a hidden cave nearby. Go there. + type: 0 + typeString: CustomFieldType_Text + - title: Parenthetical + value: + type: 0 + typeString: CustomFieldType_Text + - title: Audio Files + value: '[]' + type: 3 + typeString: CustomFieldType_Files + - title: Video File + value: + type: 0 + typeString: CustomFieldType_Text + - title: Sequence + value: + type: 0 + typeString: CustomFieldType_Text + - title: pl + value: + type: 4 + typeString: CustomFieldType_Localization + conversationID: 98 + isRoot: 0 + isGroup: 0 + nodeColor: + delaySimStatus: 0 + falseConditionAction: Block + conditionPriority: 2 + outgoingLinks: [] + conditionsString: + userScript: + onExecute: + m_PersistentCalls: + m_Calls: [] + canvasRect: + serializedVersion: 2 + x: 20 + y: 80 + width: 160 + height: 30 + canvasScrollPosition: {x: 0, y: 0} + canvasZoom: 1 syncInfo: syncActors: 0 syncItems: 0 diff --git a/Assets/Meshes/Terrain/Terrain_Land01_village.asset b/Assets/Meshes/Terrain/Terrain_Land01_village.asset index 89c4d3241742474f182f72252c73cc0533b9bd0f..63c79f0ab63aac63222fb9b37640cf02a1db0927 100644 GIT binary patch delta 14796 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�UXRyBuaDLMuP)YvULr)sk5)4|?qiqCg8X-6S%q-~5rF*ykl~a; za{j_ybMA(tfR#zyFQEM@JwbLHfKuwkX=c{S&nVBVOG98Ukt|vpc+wi>{w8n2-{J}U zZT_|pC#{vqu@7eg8-dr&x_jIMM}bG2y6vf;_eE)KCS*OK;%o4{*HNDo29M<+*}R`3 z<;l5smXtFMJQ^YKO)>bq70=z$kajFU`wFJC27Y`$gmDukXbGGZX~8w^=F#s6eR!rvLM4GV&p57b&zZ$$~J+#`qrkGVMdIWX)9+KaHL@o_RGaEVV6g`h! z0!i$Heq3NUnTW`n)BJvoLUvmR^~SqEV}BeLj4BnKO7Ep18J>k5Qjmp=M{YI;Ja2{u zfguLV^=ZD_g;@b)=QQ$~eEub_l+C|gtXBiQt;Bc-Q!o|bvMksr0s z|1Qr9Y9JStIPS$9I8KgUO^s!VG8xtULda?>s)38}T;4CNg=HOF4Xr9#Y*wz{1k`@Y z28vP9(QC=B>BsOIf$iCp5E%?Q+-g`2wHxhbr++m zN3W;4vycl-$9nRZdA)wvAg$W}ACk4Q>R3z8ZUQaImY}z{;6Yl75p|-sP@F7bQsGGD zO5egqTt-AG4o~(>TG3dgwoZi|>m;CpX@SJJHC7nfD0(l2t^}&r!3pmLns0!P0MH?4 zTQIK{=(i)=Z6ta$i#|ss4)HD=B`H3xi}6IPXjb3;*v0i@mw-5}Swnk2k6(@bVqIMfao-rb$7(<07tfDfrpGQe zej2;d*d?}|u~n?r&Tj8bb6v{E&UINVPT1|m-Hd&In5Er)%WgAzCptB2f_;;*Vq&s( zH^FXWi(Qt+&NW_+6;uIcm&wg>GjJsk} zQ!mGf1x@WMYkCLt9B!MjYLTsB&k45C6Xx3*CW;Ry+HV+w%JdvzTjr96A12s(CeGBa zqdUj}IRihRY(HfPkT=%`E!S@>u`JcEQ(drPqUfsGZ}_?!YQJs^tu@M4BdLk_XodZ{ zp{$2XlFb%0&Q?D)!6rY)Y;UYzw+45YSJ5loe#Q_f?^NuNY%{Lw~-6j@0gBTa@&P zeji%EJTZT*eUBmbR8n94M|L)Ik&VV~`uA)SB*9T{kI@%sc6O3}uf>GPa)Cv{{=K2( zuI)W+rMySjnJhxQ{bIRlfQ*dq)^ z5UgeVWv?qgj4(d6qc=itjQ%Ei6ZE&x6VTsAZ;IXwy*YXd^p@zY&|9OwgWd-HUG(?R O-$!pNj8EHDYw>@D8aRXi delta 15155 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 + if (!mf || !mf.sharedMesh) + { + Debug.LogWarning("Selected object doesn't have a valid mesh."); + return; + } + + Mesh meshToSave = Object.Instantiate(mf.sharedMesh); + string path = "Assets/SavedRiverMesh_" + selected.name + ".asset"; + + AssetDatabase.CreateAsset(meshToSave, path); + AssetDatabase.SaveAssets(); + mf.sharedMesh = meshToSave; + + Debug.Log("Saved mesh to: " + path); + } +} +#endif diff --git a/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/Editor/RamSaveMeshEditor.cs.meta b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/Editor/RamSaveMeshEditor.cs.meta new file mode 100644 index 000000000..c5bcc4559 --- /dev/null +++ b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/Editor/RamSaveMeshEditor.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 97262377ebc53af479e94059d52cc370 \ No newline at end of file diff --git a/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs new file mode 100644 index 000000000..5110ee4ad --- /dev/null +++ b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs @@ -0,0 +1,47 @@ +using UnityEngine; + +public class RiverColorChanger : MonoBehaviour +{ + public Color colorInBox = Color.red; + public Color colorOutside = Color.white; + + private void OnTriggerEnter(Collider other) + { + RamSpline spline = other.GetComponent(); + if (spline != null) + { + ChangeVertexColors(spline, colorInBox); + } + } + + private void OnTriggerExit(Collider other) + { + RamSpline spline = other.GetComponent(); + if (spline != null) + { + ChangeVertexColors(spline, colorOutside); + } + } + + void ChangeVertexColors(RamSpline spline, Color newColor) + { + MeshFilter mf = spline.GetComponent(); + if (mf == null || mf.mesh == null) + return; + + Mesh mesh = mf.mesh; + Color[] colors = mesh.colors; + + if (colors == null || colors.Length == 0) + { + colors = new Color[mesh.vertexCount]; + } + + for (int i = 0; i < colors.Length; i++) + { + colors[i] = newColor; + } + + mesh.colors = colors; + } +} diff --git a/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs.meta b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs.meta new file mode 100644 index 000000000..f5237f1d7 --- /dev/null +++ b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorChanger.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 83f7674e134927245852c8a42ba5ed08 \ No newline at end of file diff --git a/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs new file mode 100644 index 000000000..29dc53b3b --- /dev/null +++ b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs @@ -0,0 +1,54 @@ +using UnityEngine; + +[RequireComponent(typeof(BoxCollider))] +public class RiverColorVolume : MonoBehaviour +{ + public MeshRenderer riverRenderer; + + public Color shallowColor = Color.red; + public Color deepColor = Color.blue; + + public Color originalShallowColor = Color.white; + public Color originalDeepColor = Color.white; + + private Material runtimeMaterial; + + private void Start() + { + BoxCollider box = GetComponent(); + box.isTrigger = true; + + if (riverRenderer != null) + { + runtimeMaterial = riverRenderer.material; + + Debug.Log(">> Zainicjalizowano material rzeki"); + Debug.Log(">> Początkowy _ShallowColor: " + runtimeMaterial.GetColor("_ShallowColor")); + Debug.Log(">> Początkowy _DeepColor: " + runtimeMaterial.GetColor("_DeepColor")); + } + else + { + Debug.LogWarning("❌ Nie przypisano riverRenderer!"); + } + } + + private void OnTriggerEnter(Collider other) + { + if (other.gameObject == riverRenderer.gameObject && runtimeMaterial != null) + { + Debug.Log("✅ OnTriggerEnter: zmieniam kolory na czerwony/niebieski"); + runtimeMaterial.SetColor("_ShallowColor", shallowColor); + runtimeMaterial.SetColor("_DeepColor", deepColor); + } + } + + private void OnTriggerExit(Collider other) + { + if (other.gameObject == riverRenderer.gameObject && runtimeMaterial != null) + { + Debug.Log("⏹️ OnTriggerExit: przywracam oryginalne kolory"); + runtimeMaterial.SetColor("_ShallowColor", originalShallowColor); + runtimeMaterial.SetColor("_DeepColor", originalDeepColor); + } + } +} diff --git a/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs.meta b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs.meta new file mode 100644 index 000000000..724106fec --- /dev/null +++ b/Assets/ThirdParty/NatureManufacture Assets/Spline System/Scripts/RiverColorVolume.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 28996bc60f7173c4facfde388c38b1ca \ No newline at end of file diff --git a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 1.mat b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 1.mat index c7af4e22b..ddea119ec 100644 --- a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 1.mat +++ b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 1.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: DecalBottom 1 m_Shader: {fileID: 4800000, guid: d8f400148b999fe41bd30759b3a9126b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - USE_ALPHA_POW - USE_CUTOUT @@ -24,6 +26,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -123,3 +126,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.4016234, g: 0.735849, b: 0.14231041, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat new file mode 100644 index 000000000..963b7b0d7 --- /dev/null +++ b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DecalBottom 4 + m_Shader: {fileID: 4800000, guid: d8f400148b999fe41bd30759b3a9126b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - USE_ALPHA_POW + - USE_CUTOUT + - USE_WORLD_SPACE_UV + - _BLENDMODE_ADD + m_InvalidKeywords: [] + m_LightmapFlags: 5 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CutoutRamp: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _CutoutTex: + m_Texture: {fileID: 2800000, guid: 68636e928f41319458c64df671866a0a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DistortTex: + m_Texture: {fileID: 2800000, guid: 1931425b86a63f445b9a37c1830a5699, type: 3} + m_Scale: {x: 4, y: 4} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: d4b72520b0717a0429e49d44ce1027bc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Mask: + m_Texture: {fileID: 2800000, guid: ecf373375285b5d478dbad3e9f562fe2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseTex: + m_Texture: {fileID: 2800000, guid: 994e51c46f307ae4d9386e5c8022a40b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaPow: 7.12 + - _BlendMode: 0 + - _BumpScale: 1 + - _Cutoff: 0 + - _Cutout: 0.5 + - _CutoutAlphaMul: 67.21 + - _CutoutThreshold: 0.015 + - _DetailNormalMapScale: 1 + - _DistortScale: 0.62 + - _DistortSpeed: 3.11 + - _DstBlend: 0 + - _DstMode: 1 + - _Glossiness: 0.5 + - _MaskPow: 0.5 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Scale: 1.2 + - _Speed: 0.3 + - _SrcBlend: 1 + - _SrcMode: 5 + - _UVSec: 0 + - _UseAlphaPow: 1 + - _UseCutout: 1 + - _UseCutoutTex: 0 + - _UseCutoutThreshold: 0 + - _UseFrameBlending: 0 + - _UseNoiseDistortion: 0 + - _UseWorldSpaceUV: 1 + - _ZTest1: 5 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _CutoutColor: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 0.4016234, g: 0.735849, b: 0.14231041, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat.meta b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat.meta new file mode 100644 index 000000000..a75fea519 --- /dev/null +++ b/Assets/ThirdParty/PARTICLES/KriptoFX/Realistic Effects Pack v4/Effects/Materials/Effect26/DecalBottom 4.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58efd88a988216346b6616c0705f7a40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/testy/Marcin/TesttRenderer.asset b/Assets/testy/Marcin/TesttRenderer.asset index 1e9176d96..f2f7f8564 100644 --- a/Assets/testy/Marcin/TesttRenderer.asset +++ b/Assets/testy/Marcin/TesttRenderer.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a1614fc811f8f184697d9bee70ab9fe5, type: 3} m_Name: DecalRendererFeature m_EditorClassIdentifier: - m_Active: 0 + m_Active: 1 m_Settings: technique: 0 maxDrawDistance: 1000