From 8d766ed4702ca1c9b504374bacf4f1d98e79bab2 Mon Sep 17 00:00:00 2001 From: marcin Date: Mon, 25 Nov 2024 15:15:55 +0100 Subject: [PATCH] massive number of fixes, removed compilation error, logs, negative scale issues, serialization issues ETC --- Assets/Animations/kolo_wajcha.anim | 18 +- .../Nature/Trees/Old_TreeA/Old_treeA.prefab | 4 +- Assets/Meshes/scroll/scrollRT.renderTexture | 4 +- .../Common/Scripts/UI/UIPanel.cs | 2 +- .../Runic/Runic Standard Dialogue UI.prefab | 19 +- .../Dialogue/StandardUISubtitlePanel.cs | 2 +- ...nvector@MeleeCombat Player PRO2.controller | 2 +- .../Scenes/Land_01/Land_Of_Death_Demo.unity | 2144 ++++++----------- .../CharacterVisibilityController.cs | 2 +- .../Scripts/Characters/Deer/DeerController.cs | 2 +- Assets/Scripts/Characters/Player.cs | 2 +- Assets/Scripts/CollisionEventTrigger.cs | 4 +- .../Scripts/Controllers/QTE/QTEController.cs | 2 +- Assets/Scripts/DestinationTargetManager.cs | 2 +- .../Editor/CustomHierarchyDecorator.cs | 2 +- Assets/Scripts/Effects/FightCamera.cs | 4 +- Assets/Scripts/GameState/GameStateManager.cs | 22 +- Assets/Scripts/Healing/HealAnimator.cs | 6 +- .../bThirdPersonController.cs | 5 +- Assets/Scripts/PostProcessController.cs | 2 +- Assets/Scripts/Save/TreesSaver.cs | 6 +- Assets/Scripts/Skills/TreeSpotController.cs | 24 +- .../Scripts/Triggers/ColliderEventTrigger.cs | 2 +- .../Scripts/UI/ConsumablesButtonController.cs | 4 +- Assets/Scripts/UI/UIImageFader.cs | 2 +- .../Utils/Editor/DebugLoggerInitializer.cs | 3 +- Assets/Scripts/Utils/Extensions.cs | 11 +- .../Scripts/Video/VideoCutsceneController.cs | 4 +- Assets/Shaders/BeyondLit.shadergraph | 2 +- .../Shaders/BeyondLitDoubleSided.shadergraph | 2 +- Assets/Shaders/BeyondLitFade.shadergraph | 2 +- .../Shaders/BeyondLitTransparent.shadergraph | 2 +- Assets/ThirdParty/FluXY/CHANGELOG.txt | 5 + .../Resources/Flipbooks/FireFlipbook.mat | 4 +- .../Samples/Resources/Materials/Checker.mat | 29 +- .../FluXY/Samples/Resources/Materials/Fog.mat | 18 +- .../FluXY/Samples/Resources/Materials/Guy.mat | 29 +- .../Samples/Resources/Materials/Piece.mat | 61 +- .../Resources/Materials/URP ToxicWaste.mat | 18 +- .../Resources/Materials/URP VolumetricFog.mat | 35 +- .../Materials/URP VolumetricLogo.mat | 39 +- .../Materials/URP VolumetricSmoke.mat | 12 +- .../Samples/Resources/Materials/URP Water.mat | 38 +- .../Shaders/URP/FluxyVolumetric.shadergraph | 323 ++- .../Samples/URP VolumetricSmokeRing.unity | 938 ++------ .../ThirdParty/FluXY/Scripts/FluxySolver.cs | 2 + .../vThirdPersonAnimator.cs | 2 +- .../Animations/Melee_CombatSet.fbx.meta | 9 +- 48 files changed, 1442 insertions(+), 2434 deletions(-) diff --git a/Assets/Animations/kolo_wajcha.anim b/Assets/Animations/kolo_wajcha.anim index 2b7759e81..463732f7b 100644 --- a/Assets/Animations/kolo_wajcha.anim +++ b/Assets/Animations/kolo_wajcha.anim @@ -8,7 +8,7 @@ AnimationClip: m_PrefabAsset: {fileID: 0} m_Name: kolo_wajcha serializedVersion: 6 - m_Legacy: 0 + m_Legacy: 1 m_Compressed: 0 m_UseHighQualityCurve: 1 m_RotationCurves: [] @@ -86,21 +86,7 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 2720275347 - script: {fileID: 0} - typeID: 82 - customType: 0 - isPPtrCurve: 0 + genericBindings: [] pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 diff --git a/Assets/Meshes/Enviroment/Nature/Trees/Old_TreeA/Old_treeA.prefab b/Assets/Meshes/Enviroment/Nature/Trees/Old_TreeA/Old_treeA.prefab index d2ccfb249..3f635c0f7 100644 --- a/Assets/Meshes/Enviroment/Nature/Trees/Old_TreeA/Old_treeA.prefab +++ b/Assets/Meshes/Enviroment/Nature/Trees/Old_TreeA/Old_treeA.prefab @@ -312,7 +312,7 @@ Transform: m_GameObject: {fileID: 5004512160185210627} m_LocalRotation: {x: -0.10559149, y: 0.033817608, z: 0.048628133, w: 0.992644} m_LocalPosition: {x: 1.068, y: 0.292, z: 0.074} - m_LocalScale: {x: -0.04753561, y: 0.5957044, z: 0.03875747} + m_LocalScale: {x: 0.04753561, y: 0.5957044, z: 0.03875747} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2088936957602817829} @@ -366,7 +366,7 @@ Transform: m_GameObject: {fileID: 6268488875741484053} m_LocalRotation: {x: 0.036936127, y: 0.0072039403, z: -0.08499403, w: 0.99567056} m_LocalPosition: {x: 1.067, y: 0.297, z: 0.181} - m_LocalScale: {x: -0.04753561, y: 0.5957044, z: 0.03875747} + m_LocalScale: {x: 0.04753561, y: 0.5957044, z: 0.03875747} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2088936957602817829} diff --git a/Assets/Meshes/scroll/scrollRT.renderTexture b/Assets/Meshes/scroll/scrollRT.renderTexture index 293115ec7..c1f39742d 100644 --- a/Assets/Meshes/scroll/scrollRT.renderTexture +++ b/Assets/Meshes/scroll/scrollRT.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1029 - m_Height: 690 + m_Width: 1048 + m_Height: 588 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 0 diff --git a/Assets/Plugins/Pixel Crushers/Common/Scripts/UI/UIPanel.cs b/Assets/Plugins/Pixel Crushers/Common/Scripts/UI/UIPanel.cs index ac0da44ce..fc9033955 100644 --- a/Assets/Plugins/Pixel Crushers/Common/Scripts/UI/UIPanel.cs +++ b/Assets/Plugins/Pixel Crushers/Common/Scripts/UI/UIPanel.cs @@ -116,7 +116,7 @@ namespace PixelCrushers } } - private Animator m_animator = null; + protected Animator m_animator = null; private Animator myAnimator { get diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Pro/Runic/Runic Standard Dialogue UI.prefab b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Pro/Runic/Runic Standard Dialogue UI.prefab index 8773f38f5..014ce1b47 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Pro/Runic/Runic Standard Dialogue UI.prefab +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Pro/Runic/Runic Standard Dialogue UI.prefab @@ -2427,7 +2427,7 @@ MonoBehaviour: m_ReverseArrangement: 0 --- !u!95 &9581424 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2444,7 +2444,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11418554 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2574,7 +2575,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9512998 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2591,7 +2592,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &11427878 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2608,8 +2610,8 @@ MonoBehaviour: focusCheckFrequency: 0.2 refreshSelectablesFrequency: 0 selectPreviousOnDisable: 1 - showAnimationTrigger: - hideAnimationTrigger: + showAnimationTrigger: Show + hideAnimationTrigger: Hide startState: 0 waitForShowAnimationToSetOpen: 0 m_deactivateOnHidden: 1 @@ -2761,7 +2763,7 @@ CanvasGroup: m_IgnoreParentGroups: 0 --- !u!95 &9579632 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2778,7 +2780,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &175308 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/UI/Standard/Dialogue/StandardUISubtitlePanel.cs b/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/UI/Standard/Dialogue/StandardUISubtitlePanel.cs index c99ca334b..13db85ad2 100644 --- a/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/UI/Standard/Dialogue/StandardUISubtitlePanel.cs +++ b/Assets/Plugins/Pixel Crushers/Dialogue System/Scripts/UI/Standard/Dialogue/StandardUISubtitlePanel.cs @@ -107,7 +107,7 @@ namespace PixelCrushers.DialogueSystem protected Color originalColor { get; set; } private string m_accumulatedText = string.Empty; public string accumulatedText { get { return m_accumulatedText; } set { m_accumulatedText = value; } } - private Animator m_animator = null; + //private Animator m_animator = null; protected Animator animator { get { if (m_animator == null && portraitImage != null) m_animator = portraitImage.GetComponent(); return m_animator; } } private bool m_isDefaultNPCPanel = false; public bool isDefaultNPCPanel { get { return m_isDefaultNPCPanel; } set { m_isDefaultNPCPanel = value; } } diff --git a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller index 3c9b50230..72d2eb1e3 100644 --- a/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller +++ b/Assets/Prefabs/Characters/Player/Animator/Invector@MeleeCombat Player PRO2.controller @@ -19363,7 +19363,7 @@ AnimatorStateMachine: second: [] m_StateMachineBehaviours: [] m_AnyStatePosition: {x: -144, y: 0, z: 0} - m_EntryPosition: {x: -144, y: -36, z: 0} + m_EntryPosition: {x: -180, y: -110, z: 0} m_ExitPosition: {x: -144, y: 36, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 110249884} diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index a297410e3..2b4e013ee 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -1900,7 +1900,7 @@ Transform: - {fileID: 605956628} - {fileID: 620939726} m_Father: {fileID: 2106936607} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &8830951 PrefabInstance: @@ -4625,7 +4625,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d79fd46029f2cfa428619d2c20b6b48a, type: 3} m_Name: m_EditorClassIdentifier: - m_key: Trigger_Cut_Scene04_112682 + m_key: Trigger_Cut_Scene04_44366 m_appendSaverTypeToKey: 0 m_saveAcrossSceneChanges: 0 m_restoreStateOnStart: 0 @@ -5147,24 +5147,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 796008144} m_PrefabAsset: {fileID: 0} ---- !u!1 &31629006 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -8861556634559535850, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &31629010 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 31629006} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &31807999 PrefabInstance: m_ObjectHideFlags: 0 @@ -26565,7 +26547,7 @@ Transform: m_GameObject: {fileID: 138196002} m_LocalRotation: {x: 0.038143296, y: 0.60397536, z: -0.0010708304, w: 0.7960891} m_LocalPosition: {x: 64.528, y: 36.447, z: -222.017} - m_LocalScale: {x: -2.1939838, y: 0.5571966, z: 1.4682322} + m_LocalScale: {x: 2.193984, y: 0.5571966, z: 1.4682322} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -27079,24 +27061,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} ---- !u!1 &141227551 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -5767944504891794782, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &141227555 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141227551} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &141591386 GameObject: m_ObjectHideFlags: 0 @@ -28387,6 +28351,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4942438711898431270, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, + type: 3} + propertyPath: m_key + value: HopefruitVariant_13390 + objectReference: {fileID: 0} - target: {fileID: 4942438712723329106, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, type: 3} propertyPath: selectedToolbar @@ -30340,35 +30309,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 169458507} m_PrefabAsset: {fileID: 0} ---- !u!21 &169666054 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] --- !u!4 &170069444 stripped Transform: m_CorrespondingSourceObject: {fileID: 481714, guid: 99ca53aa7d57540408357af2ba39fe48, @@ -30597,7 +30537,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c71cc702f7047e94db5dacd0d5bfba8b, type: 3} m_Name: m_EditorClassIdentifier: - m_key: KillDogs2_1557670 + m_key: KillGhostSkeletons2_45372 m_appendSaverTypeToKey: 0 m_saveAcrossSceneChanges: 0 m_restoreStateOnStart: 0 @@ -40544,6 +40484,170 @@ Transform: type: 3} m_PrefabInstance: {fileID: 210097982} m_PrefabAsset: {fileID: 0} +--- !u!43 &210980926 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &212960472 PrefabInstance: m_ObjectHideFlags: 0 @@ -42505,31 +42609,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: debae7db8fff99e4e95805df5a7738af, type: 3} ---- !u!1 &217990062 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100056, guid: 30b31f81a6a9aa44688287a31b953181, - type: 3} - m_PrefabInstance: {fileID: 767904738} - m_PrefabAsset: {fileID: 0} ---- !u!205 &217990065 -LODGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 217990062} - serializedVersion: 2 - m_LocalReferencePoint: {x: -0.00023782998, y: 0.1479639, z: -0.17283963} - m_Size: 1.0729911 - m_FadeMode: 0 - m_AnimateCrossFading: 0 - m_LastLODIsBillboard: 0 - m_LODs: - - screenRelativeHeight: 0.10722523 - fadeTransitionWidth: 0 - renderers: - - renderer: {fileID: 498526879} - m_Enabled: 1 --- !u!1 &218138440 GameObject: m_ObjectHideFlags: 0 @@ -45624,7 +45703,7 @@ Transform: m_GameObject: {fileID: 245493826} m_LocalRotation: {x: -0.05999999, y: -0.96636087, z: -0.07101353, w: 0.23979957} m_LocalPosition: {x: 31.956, y: 37.48, z: -117.975} - m_LocalScale: {x: -1.9440423, y: 1.0028211, z: 7.896203} + m_LocalScale: {x: 1.944042, y: 1.0028211, z: 7.896203} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -46423,6 +46502,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4942438711898431270, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, + type: 3} + propertyPath: m_key + value: HopefruitVariant_16952 + objectReference: {fileID: 0} - target: {fileID: 4942438712723329106, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, type: 3} propertyPath: selectedToolbar @@ -48821,7 +48905,7 @@ Transform: m_GameObject: {fileID: 268293284} m_LocalRotation: {x: -0.07348447, y: -0.96883166, z: -0.016170874, w: 0.23601672} m_LocalPosition: {x: 22.4, y: 37.21, z: -111.77} - m_LocalScale: {x: -2.3156621, y: 0.95135283, z: 7.490943} + m_LocalScale: {x: 2.315662, y: 0.95135283, z: 7.490943} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -50490,7 +50574,7 @@ Transform: m_GameObject: {fileID: 282992362} m_LocalRotation: {x: -0, y: -0.12170174, z: -0, w: 0.9925667} m_LocalPosition: {x: 20.503006, y: 1.3479996, z: 0.9490051} - m_LocalScale: {x: -3.392635, y: 5.303056, z: 21.508236} + m_LocalScale: {x: 3.392635, y: 5.303056, z: 21.508236} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1362974216} @@ -53758,50 +53842,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7dfcff84cbf1254fb32b287ec9e8ea7, type: 3} ---- !u!1 &305500958 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 305500959} - - component: {fileID: 305500960} - m_Layer: 0 - m_Name: DebugLogger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &305500959 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 305500958} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2106936607} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &305500960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 305500958} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 088fd69a7d103414bb97e493265b390d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &306262373 stripped GameObject: m_CorrespondingSourceObject: {fileID: 54019902296789349, guid: debae7db8fff99e4e95805df5a7738af, @@ -61161,7 +61201,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d79fd46029f2cfa428619d2c20b6b48a, type: 3} m_Name: m_EditorClassIdentifier: - m_key: Cut_Scene_Patyk_117848 + m_key: BarkTriggerPortal_46374 m_appendSaverTypeToKey: 0 m_saveAcrossSceneChanges: 0 m_restoreStateOnStart: 0 @@ -62376,24 +62416,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8546952} m_PrefabAsset: {fileID: 0} ---- !u!1 &332985313 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6054864842156870476, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &332985317 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 332985313} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &333444034 stripped Transform: m_CorrespondingSourceObject: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, @@ -64679,24 +64701,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 353927296} m_PrefabAsset: {fileID: 0} ---- !u!1 &354587339 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2427132554482532290, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &354587343 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 354587339} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &354805287 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1f7aa4d40edff6e48b549003cad031e1, @@ -65679,7 +65683,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 57 + value: 54 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -66039,24 +66043,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 366470496} m_PrefabAsset: {fileID: 0} ---- !u!1 &366640201 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2690748439457963539, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &366640205 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 366640201} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &366664933 PrefabInstance: m_ObjectHideFlags: 0 @@ -67162,6 +67148,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4942438711898431270, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, + type: 3} + propertyPath: m_key + value: HopefruitVariant_21590 + objectReference: {fileID: 0} - target: {fileID: 4942438712723329106, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, type: 3} propertyPath: OnEndAnimation.m_PersistentCalls.m_Calls.Array.size @@ -72587,7 +72578,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 837253250} + objectReference: {fileID: 210980926} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Materials.Array.data[0] @@ -74242,24 +74233,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 692924804} m_PrefabAsset: {fileID: 0} ---- !u!1 &429056003 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3742926423421095919, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &429056007 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 429056003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &429894740 GameObject: m_ObjectHideFlags: 0 @@ -79485,7 +79458,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2106936607} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &437493525 GameObject: @@ -81722,7 +81695,7 @@ PrefabInstance: type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 666092807} + objectReference: {fileID: 1988956830} - target: {fileID: 2614899761469592907, guid: 03dbe1927cbadab49b452a55e1ba5ca0, type: 3} propertyPath: m_Materials.Array.data[0] @@ -87396,12 +87369,6 @@ Transform: m_Father: {fileID: 1517961696} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!137 &498526879 stripped -SkinnedMeshRenderer: - m_CorrespondingSourceObject: {fileID: 13700000, guid: 30b31f81a6a9aa44688287a31b953181, - type: 3} - m_PrefabInstance: {fileID: 767904738} - m_PrefabAsset: {fileID: 0} --- !u!1001 &498756211 PrefabInstance: m_ObjectHideFlags: 0 @@ -90005,35 +89972,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 522763479} m_PrefabAsset: {fileID: 0} ---- !u!21 &522813684 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Height Fog Global - m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] --- !u!1001 &523032553 PrefabInstance: m_ObjectHideFlags: 0 @@ -99705,24 +99643,6 @@ MonoBehaviour: UseRandomRotationAndScale: 0 randomScalePercent: 20 IsScreenSpace: 1 ---- !u!1 &574348729 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3425573337173925296, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &574348733 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574348729} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &575195006 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -105735,7 +105655,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 60 + value: 57 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -108604,24 +108524,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 629615619} m_PrefabAsset: {fileID: 0} ---- !u!1 &630124308 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 306505852752579596, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &630124312 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 630124308} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &630364052 PrefabInstance: m_ObjectHideFlags: 0 @@ -109771,24 +109673,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 636604708} m_PrefabAsset: {fileID: 0} ---- !u!1 &637197340 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 6139709984642541925, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &637197344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 637197340} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &637378552 PrefabInstance: m_ObjectHideFlags: 0 @@ -111462,6 +111346,11 @@ PrefabInstance: propertyPath: m_onDestroy.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 8094605426798968899, guid: 23a159559436b754a8829a1c7244eb31, + type: 3} + propertyPath: m_key + value: WoodenBox2Dark__destructable_33576 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 23a159559436b754a8829a1c7244eb31, type: 3} --- !u!4 &650724191 stripped @@ -116093,170 +115982,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 03df45e87d172b548848bb1ac9d750eb, type: 3} ---- !u!43 &666092807 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &666155665 PrefabInstance: m_ObjectHideFlags: 0 @@ -119470,24 +119195,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 691412796} m_PrefabAsset: {fileID: 0} ---- !u!1 &692155819 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2006952618381903151, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &692155823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 692155819} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &692924804 PrefabInstance: m_ObjectHideFlags: 0 @@ -125165,7 +124872,7 @@ PrefabInstance: - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} propertyPath: m_RootOrder - value: 59 + value: 56 objectReference: {fileID: 0} - target: {fileID: 5910213135951128004, guid: 52957d3aa9e8d034d9c3ffbbfe6e91b3, type: 3} @@ -125755,24 +125462,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bab2793d8b5d9014da7a4a0161daa9e4, type: 3} ---- !u!1 &719102162 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5110093731809569835, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &719102166 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 719102162} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &719346908 stripped Transform: m_CorrespondingSourceObject: {fileID: 439570, guid: fd66f149b2157824e97e00c7de67d942, @@ -142401,170 +142090,6 @@ Transform: m_Father: {fileID: 1126095948} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: -78.332, z: 0} ---- !u!43 &837253250 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1001 &838854660 PrefabInstance: m_ObjectHideFlags: 0 @@ -144642,7 +144167,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d79fd46029f2cfa428619d2c20b6b48a, type: 3} m_Name: m_EditorClassIdentifier: - m_key: Cut_Scene_Patyk_117848 + m_key: BarkTriggerTutorialChest_49804 m_appendSaverTypeToKey: 0 m_saveAcrossSceneChanges: 0 m_restoreStateOnStart: 0 @@ -145168,170 +144693,6 @@ Transform: m_Father: {fileID: 1504474634} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -108.709, z: 0} ---- !u!43 &851457655 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &851570508 GameObject: m_ObjectHideFlags: 0 @@ -148528,24 +147889,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &884614690 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4974724838783455946, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &884614694 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 884614690} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &885023951 GameObject: m_ObjectHideFlags: 0 @@ -155381,24 +154724,6 @@ MonoBehaviour: - {fileID: 735080250} - {fileID: 1621531071} - {fileID: 1499092980} ---- !u!1 &904268519 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -1944421647969453432, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &904268523 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 904268519} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &904450841 GameObject: m_ObjectHideFlags: 0 @@ -167476,66 +166801,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 228036340} m_PrefabAsset: {fileID: 0} ---- !u!21 &965157443 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Override - m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _DIRECTIONALL: 1 - - _DirectionalFalloff: 2 - - _DirectionalIntensity: 1 - - _DirectionalMode: 1 - - _FOGG: 1 - - _FogAxisMode: 1 - - _FogColorDuo: 1 - - _FogDistanceEnd: 200 - - _FogDistanceFalloff: 2 - - _FogDistanceStart: -200 - - _FogHeightEnd: 200 - - _FogHeightFalloff: 2 - - _FogHeightStart: 0 - - _FogIntensity: 1 - - _FogLayersMode: 0 - - _IsHeightFogPreset: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _NOISEE: 1 - - _NoiseDistanceEnd: 50 - - _NoiseIntensity: 1 - - _NoiseMode: 2 - - _NoiseModeBlend: 1 - - _NoiseScale: 30 - - _SKYBOXX: 1 - - _SkyboxFogFalloff: 1 - - _SkyboxFogFill: 1 - - _SkyboxFogHeight: 1 - - _SkyboxFogIntensity: 1 - - _TITLE: 1 - m_Colors: - - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} - - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} - - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} - - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} - - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} - - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} - m_BuildTextureStacks: [] --- !u!1001 &965332649 PrefabInstance: m_ObjectHideFlags: 0 @@ -170160,7 +169425,7 @@ Transform: m_GameObject: {fileID: 994626155} m_LocalRotation: {x: -0.044506844, y: -0.89846575, z: -0.08162145, w: 0.42908794} m_LocalPosition: {x: -17.52, y: 38.87, z: -59.41} - m_LocalScale: {x: -3.927404, y: 15.708822, z: 12.704772} + m_LocalScale: {x: 3.927404, y: 15.708822, z: 12.704772} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -172894,7 +172159,7 @@ Transform: - {fileID: 2106284260} - {fileID: 1734395329} m_Father: {fileID: 2106936607} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1013471083 PrefabInstance: @@ -184004,24 +183269,6 @@ MonoBehaviour: - {fileID: 84401888} - {fileID: 321473284} - {fileID: 1125985310} ---- !u!1 &1076899257 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -5397218715108194065, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1076899261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1076899257} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1077729075 PrefabInstance: m_ObjectHideFlags: 0 @@ -211312,24 +210559,6 @@ PlayableDirector: type: 3} m_PrefabInstance: {fileID: 1243730571} m_PrefabAsset: {fileID: 0} ---- !u!1 &1243921147 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1093658511033923026, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1243921151 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1243921147} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1243923932 stripped Transform: m_CorrespondingSourceObject: {fileID: 2057110839145940228, guid: 257a5d29e26dd3e49832a6a47b9520c5, @@ -212054,7 +211283,7 @@ Transform: m_Children: - {fileID: 164114525} m_Father: {fileID: 2106936607} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1250446170 GameObject: @@ -212656,24 +211885,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1254445378} m_PrefabAsset: {fileID: 0} ---- !u!1 &1254656868 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4427768249787979512, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1254656872 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254656868} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1254691434 PrefabInstance: m_ObjectHideFlags: 0 @@ -213431,24 +212642,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe91b44cb15078e40bcfe633f6eb1a24, type: 3} ---- !u!1 &1260727098 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -7598110306348562479, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1260727102 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1260727098} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1260883007 stripped Transform: m_CorrespondingSourceObject: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, @@ -214536,7 +213729,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2106936607} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1266553943 stripped GameObject: @@ -225362,7 +224555,7 @@ PrefabInstance: - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3432910959037098304, guid: a8a6d6581670a5948b357f0ceb83318a, type: 3} @@ -230729,6 +229922,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.854 objectReference: {fileID: 0} + - target: {fileID: 8042196165137186663, guid: 23a159559436b754a8829a1c7244eb31, + type: 3} + propertyPath: m_key + value: WoodenBox2_Fragmented_76098 + objectReference: {fileID: 0} + - target: {fileID: 8042196165137186663, guid: 23a159559436b754a8829a1c7244eb31, + type: 3} + propertyPath: m_appendSaverTypeToKey + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8042196165137186663, guid: 23a159559436b754a8829a1c7244eb31, type: 3} propertyPath: m_saveAcrossSceneChanges @@ -232736,7 +231939,7 @@ Transform: m_GameObject: {fileID: 1421394586} m_LocalRotation: {x: 0.037584957, y: 0.48216522, z: -0.0065900427, w: 0.87524897} m_LocalPosition: {x: 69.956, y: 36.13, z: -221.045} - m_LocalScale: {x: -2.3414798, y: 0.6534571, z: 1.655845} + m_LocalScale: {x: 2.34148, y: 0.6534571, z: 1.655845} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -233025,170 +232228,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!43 &1423609385 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 0 - m_KeepIndices: 0 - m_IndexFormat: 1 - m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 24 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 768 - _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 7.5, y: 7.5, z: 9} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &1425135080 GameObject: m_ObjectHideFlags: 0 @@ -234609,7 +233648,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d79fd46029f2cfa428619d2c20b6b48a, type: 3} m_Name: m_EditorClassIdentifier: - m_key: Trigger_Cut_Scene_st1_120774 + m_key: Trigger_Cut_Scene_st1_53436 m_appendSaverTypeToKey: 0 m_saveAcrossSceneChanges: 0 m_restoreStateOnStart: 0 @@ -241650,6 +240689,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1449079687549003106, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_85268 + objectReference: {fileID: 0} + - target: {fileID: 1451377874170950269, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_85456 + objectReference: {fileID: 0} - target: {fileID: 1815426357795815225, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_IsActive @@ -241682,6 +240731,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2462238545564280804, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_85644 + objectReference: {fileID: 0} + - target: {fileID: 3039062091300725670, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_85832 + objectReference: {fileID: 0} - target: {fileID: 3503784144502787276, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_IsActive @@ -242059,6 +241118,11 @@ PrefabInstance: value: objectReference: {fileID: 3669629983461182018, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 4064575719423108041, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_86020 + objectReference: {fileID: 0} - target: {fileID: 4533436680991245334, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_key @@ -242070,6 +241134,11 @@ PrefabInstance: value: objectReference: {fileID: 4533436680991245334, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 4914211652613011673, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_86208 + objectReference: {fileID: 0} - target: {fileID: 5113118932850574124, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_LocalPosition.x @@ -242204,6 +241273,11 @@ PrefabInstance: value: objectReference: {fileID: 7307695261867174976, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 7724533111161520592, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_86396 + objectReference: {fileID: 0} - target: {fileID: 7800349257101312188, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_Radius @@ -242219,6 +241293,11 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: -1.237 objectReference: {fileID: 0} + - target: {fileID: 8639379414720456161, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_86584 + objectReference: {fileID: 0} - target: {fileID: 8892916629674089881, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_key @@ -242230,6 +241309,11 @@ PrefabInstance: value: objectReference: {fileID: 8892916629674089881, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 9074580463523799553, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_86772 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7800349257101312177, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} @@ -242260,7 +241344,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1499737215} - - component: {fileID: 1499737216} m_Layer: 0 m_Name: GoBackToGate m_TagString: Untagged @@ -242287,18 +241370,6 @@ Transform: m_Father: {fileID: 1565036104} m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1499737216 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1499737214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bd9c2a18ac8fe0743b53ba8c8d623415, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1501825555 PrefabInstance: m_ObjectHideFlags: 0 @@ -242713,7 +241784,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c71cc702f7047e94db5dacd0d5bfba8b, type: 3} m_Name: m_EditorClassIdentifier: - m_key: KillDogs2_1557670 + m_key: KillGhostSkeletons1_53822 m_appendSaverTypeToKey: 0 m_saveAcrossSceneChanges: 0 m_restoreStateOnStart: 0 @@ -243316,24 +242387,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1507424316} m_PrefabAsset: {fileID: 0} ---- !u!1 &1507903132 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3176540253063808948, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1507903136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1507903132} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!95 &1508651686 stripped Animator: m_CorrespondingSourceObject: {fileID: 2881367511299427521, guid: e115436bfe06bd447a266ca75621bbdd, @@ -248348,24 +247401,6 @@ Transform: m_Father: {fileID: 1369590070} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1512373517 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7527537600291217443, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1512373521 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1512373517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1512520165 stripped Transform: m_CorrespondingSourceObject: {fileID: 613357951197556803, guid: 423be60259007b649820025bec79195a, @@ -248819,7 +247854,7 @@ Transform: m_GameObject: {fileID: 1516275263} m_LocalRotation: {x: 0.017321428, y: 0.6037969, z: 0.014716744, w: 0.796814} m_LocalPosition: {x: 59.83, y: 36.37, z: -222.85} - m_LocalScale: {x: -2.0396678, y: 0.50458634, z: 1.27861} + m_LocalScale: {x: 2.039668, y: 0.50458634, z: 1.27861} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -256536,24 +255571,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1554208610} m_PrefabAsset: {fileID: 0} ---- !u!1 &1556528741 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3413318125196687049, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1556528745 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1556528741} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1557190572 GameObject: m_ObjectHideFlags: 0 @@ -259277,7 +258294,7 @@ PrefabInstance: - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} propertyPath: m_RootOrder - value: 58 + value: 55 objectReference: {fileID: 0} - target: {fileID: 1861859122261593409, guid: 44beb8d5d9bcab84a8418b5a29cc46d7, type: 3} @@ -261795,7 +260812,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 56 + value: 53 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -263466,6 +262483,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 1449079687549003106, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_93810 + objectReference: {fileID: 0} + - target: {fileID: 1451377874170950269, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_93998 + objectReference: {fileID: 0} - target: {fileID: 1815426357795815225, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_IsActive @@ -263498,6 +262525,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2462238545564280804, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_94186 + objectReference: {fileID: 0} + - target: {fileID: 3039062091300725670, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_94374 + objectReference: {fileID: 0} - target: {fileID: 3503784144502787276, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_IsActive @@ -264305,6 +263342,11 @@ PrefabInstance: value: objectReference: {fileID: 3669629983461182018, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 4064575719423108041, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_94562 + objectReference: {fileID: 0} - target: {fileID: 4533436680991245334, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_key @@ -264316,6 +263358,11 @@ PrefabInstance: value: objectReference: {fileID: 4533436680991245334, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 4914211652613011673, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_94750 + objectReference: {fileID: 0} - target: {fileID: 5113118932850574124, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_LocalPosition.x @@ -264455,6 +263502,11 @@ PrefabInstance: value: objectReference: {fileID: 7307695261867174976, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 7724533111161520592, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_94938 + objectReference: {fileID: 0} - target: {fileID: 7800349257101312188, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_Radius @@ -264470,6 +263522,11 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0.719 objectReference: {fileID: 0} + - target: {fileID: 8639379414720456161, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_95126 + objectReference: {fileID: 0} - target: {fileID: 8892916629674089881, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} propertyPath: m_key @@ -264481,6 +263538,11 @@ PrefabInstance: value: objectReference: {fileID: 8892916629674089881, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} + - target: {fileID: 9074580463523799553, guid: f1f7a459abba8f44f8748c4db03298f2, + type: 3} + propertyPath: m_key + value: PeacefruitVariant_95314 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7800349257101312177, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f1f7a459abba8f44f8748c4db03298f2, type: 3} @@ -266540,24 +265602,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 513630360} m_PrefabAsset: {fileID: 0} ---- !u!1 &1631945271 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3898017950118290324, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1631945275 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631945271} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &1632528671 stripped Transform: m_CorrespondingSourceObject: {fileID: 3056393058199397780, guid: 003daaab58a32ca419f0a3ef3dbef864, @@ -271574,24 +270618,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1665297563} m_PrefabAsset: {fileID: 0} ---- !u!1 &1665357075 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -2417019959251305667, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1665357079 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1665357075} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1665768293 PrefabInstance: m_ObjectHideFlags: 0 @@ -275299,7 +274325,7 @@ PrefabInstance: - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4821156325998443017, guid: ae4b0695317d14919ac647ff1705692a, type: 3} @@ -275540,22 +274566,22 @@ PrefabInstance: - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -135 objectReference: {fileID: 0} - target: {fileID: 586129268022760963, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -275635,22 +274661,22 @@ PrefabInstance: - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210.00003 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -45 objectReference: {fileID: 0} - target: {fileID: 619154579508930244, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -275712,6 +274738,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 663955414079559886, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 681929434079199430, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.x @@ -275797,6 +274828,11 @@ PrefabInstance: propertyPath: objectsToInteractwith.Array.data[1] value: objectReference: {fileID: 2062906176} + - target: {fileID: 800894677837967788, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 814093871534118934, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: objectsToInteractwith.Array.data[0] @@ -275837,6 +274873,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1057643721572213101, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_key + value: Trigger_TutorialSpider_122792 + objectReference: {fileID: 0} - target: {fileID: 1059911497360238499, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_SizeDelta.y @@ -275882,6 +274923,11 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 58389831} + - target: {fileID: 1343969542120563993, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1535820111834847140, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_Name @@ -276402,6 +275448,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -122.5 objectReference: {fileID: 0} + - target: {fileID: 2921329410743145390, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2976790053899220974, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y @@ -276575,7 +275626,7 @@ PrefabInstance: - target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: -26 + value: -26.000061 objectReference: {fileID: 0} - target: {fileID: 3758077481048222789, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -276592,11 +275643,21 @@ PrefabInstance: propertyPath: m_Name value: 2=UI objectReference: {fileID: 0} + - target: {fileID: 3862789442321375176, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: debugMode + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3873896304072121275, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3965356376133449231, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4012045513466333265, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.x @@ -276780,22 +275841,22 @@ PrefabInstance: - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -225 objectReference: {fileID: 0} - target: {fileID: 4226887360462239141, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -276847,6 +275908,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -480.95007 objectReference: {fileID: 0} + - target: {fileID: 4432870194329877364, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_key + value: Trigger_TutorialHealth_122800 + objectReference: {fileID: 0} - target: {fileID: 4482619522463753509, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y @@ -276975,22 +276041,22 @@ PrefabInstance: - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -315 objectReference: {fileID: 0} - target: {fileID: 4816654799405075645, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -277512,6 +276578,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5280442117336047845, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_key + value: 1=TutorialBasicHealth=PlayerHealing_119778 + objectReference: {fileID: 0} - target: {fileID: 5378002776356233848, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y @@ -277557,6 +276628,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 781.9 objectReference: {fileID: 0} + - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: debugMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5626453474630301766, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5657452459766331955, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.x @@ -277607,6 +276688,16 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5935883484735210940, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: debugMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5935883484735210940, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: selectedToolbar + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6036430887122037825, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.x @@ -277717,6 +276808,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 5 objectReference: {fileID: 0} + - target: {fileID: 6211729781633911874, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_key + value: 1=TutorialSpider=SpiderFight_116838 + objectReference: {fileID: 0} - target: {fileID: 6219626675438554779, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y @@ -277807,6 +276903,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6533865374260509787, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -110.50049 + objectReference: {fileID: 0} - target: {fileID: 6543828544445164303, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_Name @@ -277872,6 +276973,21 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 6806271821836326573, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_debugSettings.m_debug + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6806271821836326573, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_debugSettings.m_debugMessageSystem + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6806271821836326573, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: m_debugSettings.m_debugQuestGenerator + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6821648173181239528, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: onStepStart.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -278210,22 +277326,22 @@ PrefabInstance: - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 210 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -405 objectReference: {fileID: 0} - target: {fileID: 7555233443493320287, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -279158,24 +278274,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1048350756} m_PrefabAsset: {fileID: 0} ---- !u!1 &1681580781 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -4399891612035454117, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1681580785 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1681580781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1681623026 GameObject: m_ObjectHideFlags: 0 @@ -289412,7 +288510,7 @@ PrefabInstance: - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} propertyPath: m_RootOrder - value: 61 + value: 58 objectReference: {fileID: 0} - target: {fileID: 4283788935881206155, guid: 9ec7b44ed3172f04d9b12c5394ae2b39, type: 3} @@ -291416,7 +290514,7 @@ PrefabInstance: - target: {fileID: 594356830411810354, guid: 23a159559436b754a8829a1c7244eb31, type: 3} propertyPath: m_RootOrder - value: 62 + value: 59 objectReference: {fileID: 0} - target: {fileID: 594356830411810354, guid: 23a159559436b754a8829a1c7244eb31, type: 3} @@ -293198,7 +292296,7 @@ PrefabInstance: - target: {fileID: 2125157575829794040, guid: 9c27b9d55f80e6a41996519540d7e225, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2125157575829794040, guid: 9c27b9d55f80e6a41996519540d7e225, type: 3} @@ -293259,7 +292357,7 @@ PrefabInstance: type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 522813684} + objectReference: {fileID: 1830793005} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c27b9d55f80e6a41996519540d7e225, type: 3} --- !u!4 &1773574635 stripped @@ -297485,7 +296583,7 @@ PrefabInstance: - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} propertyPath: m_RootOrder - value: 63 + value: 60 objectReference: {fileID: 0} - target: {fileID: 927769488672062261, guid: 8254231ee5fadae4b9b0a4a2a3d3c1d3, type: 3} @@ -302211,6 +301309,35 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1830364133} m_PrefabAsset: {fileID: 0} +--- !u!21 &1830793005 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Height Fog Global + m_Shader: {fileID: 4800000, guid: 3a7ef1b66bafb7a448a880ef76d2e6e6, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] --- !u!1 &1832109879 GameObject: m_ObjectHideFlags: 0 @@ -304893,24 +304020,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1847958780} m_PrefabAsset: {fileID: 0} ---- !u!1 &1848594999 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -7647639740670042505, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1848595003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1848594999} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1848735149 PrefabInstance: m_ObjectHideFlags: 0 @@ -306797,24 +305906,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1865478352} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1866041701 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -3544190457736617189, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1866041705 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1866041701} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1866894748 PrefabInstance: m_ObjectHideFlags: 0 @@ -311288,7 +310379,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2106936607} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1899382006 stripped GameObject: @@ -311462,7 +310553,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d3ee7654fb1dcff41b62c9ccb5f3111f, type: 3} m_Name: m_EditorClassIdentifier: - m_key: + m_key: Trigger_PlantTree_tutorial_56456 m_appendSaverTypeToKey: 0 m_saveAcrossSceneChanges: 0 m_restoreStateOnStart: 0 @@ -314649,24 +313740,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1919977302} m_PrefabAsset: {fileID: 0} ---- !u!1 &1920038811 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -4737906286959864685, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1920038815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1920038811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1920087855 PrefabInstance: m_ObjectHideFlags: 0 @@ -321081,24 +320154,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!1 &1954670983 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4999763214966239479, guid: 1b1e6ad5c7db50147a373759a5c99495, - type: 3} - m_PrefabInstance: {fileID: 1955653006} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1954670987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1954670983} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cca74970622327a489f2273db8862c0e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1955653006 PrefabInstance: m_ObjectHideFlags: 0 @@ -325355,7 +324410,7 @@ Transform: m_GameObject: {fileID: 1982056566} m_LocalRotation: {x: -0.05999999, y: -0.96636087, z: -0.07101353, w: 0.23979957} m_LocalPosition: {x: 31.956, y: 37.48, z: -117.975} - m_LocalScale: {x: -1.9440423, y: 1.0028211, z: 7.896203} + m_LocalScale: {x: 1.944042, y: 1.0028211, z: 7.896203} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -325829,6 +324884,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4942438711898431270, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, + type: 3} + propertyPath: m_key + value: HopefruitVariant_138564 + objectReference: {fileID: 0} - target: {fileID: 4942438712723329106, guid: 43c06bb4a2fc7934ab89119e4d2da3e9, type: 3} propertyPath: OnPlayerEnter.m_PersistentCalls.m_Calls.Array.size @@ -326199,6 +325259,170 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9dae1a0512df8f4996c103cd325f56f, type: 3} +--- !u!43 &1988956830 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 0 + m_KeepIndices: 0 + m_IndexFormat: 1 + m_IndexBuffer: 00000000010000000300000001000000020000000300000004000000050000000700000005000000060000000700000008000000090000000b000000090000000a0000000b0000000c0000000d0000000f0000000d0000000e0000000f000000100000001100000013000000110000001200000013000000140000001500000017000000150000001600000017000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 24 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 768 + _typelessdata: 0000f0c00000f0c000001041000000800000803f000000800000803f0000803f0000f0400000f0c000001041000000800000803f00000080000000000000803f0000f0400000f0c0000010c1000000800000803f0000008000000000000000000000f0c00000f0c0000010c1000000800000803f000000800000803f000000000000f0c00000f040000010c10000803f00000080000000800000803f0000803f0000f0c00000f040000010410000803f0000008000000080000000000000803f0000f0c00000f0c0000010410000803f000000800000008000000000000000000000f0c00000f0c0000010c10000803f00000080000000800000803f000000000000f0c00000f040000010410000008000000080000080bf0000803f0000803f0000f0400000f040000010410000008000000080000080bf000000000000803f0000f0400000f0c0000010410000008000000080000080bf00000000000000000000f0c00000f0c0000010410000008000000080000080bf0000803f000000000000f0400000f040000010c100000080000000800000803f0000803f0000803f0000f0c00000f040000010c100000080000000800000803f000000000000803f0000f0c00000f0c0000010c100000080000000800000803f00000000000000000000f0400000f0c0000010c100000080000000800000803f0000803f000000000000f0400000f04000001041000080bf00000080000000800000803f0000803f0000f0400000f040000010c1000080bf0000008000000080000000000000803f0000f0400000f0c0000010c1000080bf000000800000008000000000000000000000f0400000f0c000001041000080bf00000080000000800000803f000000000000f0c00000f040000010c100000080000080bf000000800000803f0000803f0000f0400000f040000010c100000080000080bf00000080000000000000803f0000f0400000f0400000104100000080000080bf0000008000000000000000000000f0c00000f0400000104100000080000080bf000000800000803f00000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 7.5, y: 7.5, z: 9} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1001 &1989866158 PrefabInstance: m_ObjectHideFlags: 0 @@ -326973,7 +326197,7 @@ Transform: m_GameObject: {fileID: 1997635632} m_LocalRotation: {x: 0.010246405, y: 0.7492909, z: -0.046630833, w: 0.66051775} m_LocalPosition: {x: 59.274, y: 31.739, z: -208.379} - m_LocalScale: {x: -1.8733335, y: 0.59774166, z: 2.3439543} + m_LocalScale: {x: 1.873333, y: 0.59774166, z: 2.3439543} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 830642059} @@ -331452,6 +330676,66 @@ Transform: m_Father: {fileID: 2003794393} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &2031119687 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Override + m_Shader: {fileID: 4800000, guid: a3a3bc8785681554d9558e2ea68f100e, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _DIRECTIONALL: 1 + - _DirectionalFalloff: 2 + - _DirectionalIntensity: 1 + - _DirectionalMode: 1 + - _FOGG: 1 + - _FogAxisMode: 1 + - _FogColorDuo: 1 + - _FogDistanceEnd: 200 + - _FogDistanceFalloff: 2 + - _FogDistanceStart: -200 + - _FogHeightEnd: 200 + - _FogHeightFalloff: 2 + - _FogHeightStart: 0 + - _FogIntensity: 1 + - _FogLayersMode: 0 + - _IsHeightFogPreset: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _NOISEE: 1 + - _NoiseDistanceEnd: 50 + - _NoiseIntensity: 1 + - _NoiseMode: 2 + - _NoiseModeBlend: 1 + - _NoiseScale: 30 + - _SKYBOXX: 1 + - _SkyboxFogFalloff: 1 + - _SkyboxFogFill: 1 + - _SkyboxFogHeight: 1 + - _SkyboxFogIntensity: 1 + - _TITLE: 1 + m_Colors: + - _DirectionalColor: {r: 1, g: 0.7793103, b: 0.5, a: 1} + - _DirectionalDir: {r: 0, g: 0, b: 0, a: 0} + - _FogAxisOption: {r: 0, g: 0, b: 0, a: 0} + - _FogColorEnd: {r: 0.8862745, g: 1.443137, b: 2, a: 1} + - _FogColorStart: {r: 0.4411765, g: 0.722515, b: 1, a: 1} + - _NoiseSpeed: {r: 0.5, g: 0, b: 0.5, a: 0} + m_BuildTextureStacks: [] --- !u!1 &2031433312 GameObject: m_ObjectHideFlags: 0 @@ -340539,7 +339823,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1514022044} - - {fileID: 305500959} - {fileID: 1675787165} - {fileID: 3432910959870172171} - {fileID: 1346070949} @@ -404926,7 +404209,7 @@ PrefabInstance: - target: {fileID: 667137204048347769, guid: 45da6623b89fe7942b8c4ef47aa2be3a, type: 3} propertyPath: m_key - value: Triger_WrongWay_3_4154066 + value: Triger_WrongWay_3_149086 objectReference: {fileID: 0} - target: {fileID: 667137204048347769, guid: 45da6623b89fe7942b8c4ef47aa2be3a, type: 3} @@ -407665,7 +406948,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2106936607} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0.367, y: 0, z: 0} --- !u!114 &3432910959870172182 MonoBehaviour: @@ -432326,6 +431609,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 959742649} m_Modifications: + - target: {fileID: 4857353637152758523, guid: a41bdcbd4d2237d4ea1158ba8f08c293, + type: 3} + propertyPath: m_key + value: Pot_011_150090 + objectReference: {fileID: 0} - target: {fileID: 7054030463105029163, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} propertyPath: m_RootOrder @@ -433660,6 +432948,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 959742649} m_Modifications: + - target: {fileID: 2049911772785384197, guid: 5200b3e50470f2b429132041250b6210, + type: 3} + propertyPath: m_key + value: Barrel_destruction1_151712 + objectReference: {fileID: 0} - target: {fileID: 5902290343441514530, guid: 5200b3e50470f2b429132041250b6210, type: 3} propertyPath: m_Name @@ -434895,6 +434188,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 959742649} m_Modifications: + - target: {fileID: 4857353637152758523, guid: a41bdcbd4d2237d4ea1158ba8f08c293, + type: 3} + propertyPath: m_key + value: Pot_01_153234 + objectReference: {fileID: 0} - target: {fileID: 7054030463105029163, guid: a41bdcbd4d2237d4ea1158ba8f08c293, type: 3} propertyPath: m_RootOrder @@ -440783,6 +440081,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 116.086 objectReference: {fileID: 0} + - target: {fileID: 3295447798503323101, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04753561 + objectReference: {fileID: 0} + - target: {fileID: 6197059673001122922, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04753561 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46e6911bcd226d64eb62ffc06ef376f4, type: 3} --- !u!1001 &6030635299625155623 @@ -440951,6 +440259,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 4.33 objectReference: {fileID: 0} + - target: {fileID: 3295447798503323101, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04753561 + objectReference: {fileID: 0} + - target: {fileID: 6197059673001122922, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04753561 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46e6911bcd226d64eb62ffc06ef376f4, type: 3} --- !u!1001 &6030635299793307979 @@ -441896,6 +441214,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 9.883 objectReference: {fileID: 0} + - target: {fileID: 3295447798503323101, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04753561 + objectReference: {fileID: 0} + - target: {fileID: 6197059673001122922, guid: 46e6911bcd226d64eb62ffc06ef376f4, + type: 3} + propertyPath: m_LocalScale.x + value: 0.04753561 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46e6911bcd226d64eb62ffc06ef376f4, type: 3} --- !u!108 &6642733727774562924 diff --git a/Assets/Scripts/Characters/CharacterVisibilityController.cs b/Assets/Scripts/Characters/CharacterVisibilityController.cs index d3145960c..b53b935e7 100644 --- a/Assets/Scripts/Characters/CharacterVisibilityController.cs +++ b/Assets/Scripts/Characters/CharacterVisibilityController.cs @@ -96,7 +96,7 @@ namespace Beyond private Shader m_transparent; private Shader m_opaque; private int m_thresholID = Shader.PropertyToID("_Threshold"); - private int m_baseColorID = Shader.PropertyToID("BaseColor"); + private int m_baseColorID = Shader.PropertyToID("_BaseColor"); private int m_FresnelColorID = Shader.PropertyToID("_FresnelColor"); private int m_FresnelPowerID = Shader.PropertyToID("FresnelPower"); private int m_InvisibilityID = Shader.PropertyToID("_Invisibility"); diff --git a/Assets/Scripts/Characters/Deer/DeerController.cs b/Assets/Scripts/Characters/Deer/DeerController.cs index 6dc9a4908..75c5664b6 100644 --- a/Assets/Scripts/Characters/Deer/DeerController.cs +++ b/Assets/Scripts/Characters/Deer/DeerController.cs @@ -13,7 +13,7 @@ namespace Beyond [SerializeField] private new Renderer renderer; - private string colorString = "BaseColor"; + private string colorString = "_BaseColor"; public float movementDuration = 9f; diff --git a/Assets/Scripts/Characters/Player.cs b/Assets/Scripts/Characters/Player.cs index f67cbeaef..9c177b934 100644 --- a/Assets/Scripts/Characters/Player.cs +++ b/Assets/Scripts/Characters/Player.cs @@ -135,7 +135,7 @@ namespace Beyond [SerializeField] public MenuScroll menuScroll; // [SerializeField] - private int faithRegenValue = 1; + //private int faithRegenValue = 1; // private float faithRegenTime = 1f; // private float faithCurrentTime = 0f; diff --git a/Assets/Scripts/CollisionEventTrigger.cs b/Assets/Scripts/CollisionEventTrigger.cs index efac7d73e..c56c52d25 100644 --- a/Assets/Scripts/CollisionEventTrigger.cs +++ b/Assets/Scripts/CollisionEventTrigger.cs @@ -31,7 +31,7 @@ public class CollisionEventTrigger : MonoBehaviour if (useTagFilter && collision.gameObject.tag != targetTag) { - Debug.Log("Collision with object with different tag."); + //Debug.Log("Collision with object with different tag."); return; } @@ -53,7 +53,7 @@ public class CollisionEventTrigger : MonoBehaviour // Check if the event is assigned (not null) if (OnCollisionEnterEvent != null) { - Debug.Log("Event is being invoked."); + //Debug.Log("Event is being invoked."); // Invoke the event OnCollisionEnterEvent.Invoke(); } diff --git a/Assets/Scripts/Controllers/QTE/QTEController.cs b/Assets/Scripts/Controllers/QTE/QTEController.cs index eb3ecbbd8..fd4fb9b00 100644 --- a/Assets/Scripts/Controllers/QTE/QTEController.cs +++ b/Assets/Scripts/Controllers/QTE/QTEController.cs @@ -23,7 +23,7 @@ namespace Beyond private const string SEQUENCE_END_TAG = "QTEEnd"; - private bool startedFade = false; + //private bool startedFade = false; public bool IsSequenceRunning { get => m_isSequenceRunning; } diff --git a/Assets/Scripts/DestinationTargetManager.cs b/Assets/Scripts/DestinationTargetManager.cs index 1f87cc940..92cb1ee7a 100644 --- a/Assets/Scripts/DestinationTargetManager.cs +++ b/Assets/Scripts/DestinationTargetManager.cs @@ -23,7 +23,7 @@ namespace Beyond if (Instance == null) { Instance = this; - DontDestroyOnLoad(gameObject); + //DontDestroyOnLoad(gameObject); } else { diff --git a/Assets/Scripts/Editor/CustomHierarchyDecorator.cs b/Assets/Scripts/Editor/CustomHierarchyDecorator.cs index 363581163..f15c3de2e 100644 --- a/Assets/Scripts/Editor/CustomHierarchyDecorator.cs +++ b/Assets/Scripts/Editor/CustomHierarchyDecorator.cs @@ -37,7 +37,7 @@ public static class CustomHierarchyDecorator return; } - Debug.Log("HierarchyDecoratorSettings loaded successfully."); + //Debug.Log("HierarchyDecoratorSettings loaded successfully."); } // Rysowanie nag³ówka diff --git a/Assets/Scripts/Effects/FightCamera.cs b/Assets/Scripts/Effects/FightCamera.cs index 531bc282a..261bb0c5a 100644 --- a/Assets/Scripts/Effects/FightCamera.cs +++ b/Assets/Scripts/Effects/FightCamera.cs @@ -78,8 +78,8 @@ namespace Beyond m_meleeManager.onDamageHit.RemoveListener(OnDamageHit); m_meleeManager.onRecoilHit.RemoveListener(OnDamageHit); } - if (m_postProcessType == PostProcessType.ON_COMBAT) - GameStateManager.Instance.m_OnStateChanged.AddListener(OnGameStateChange); + if (m_postProcessType == PostProcessType.ON_COMBAT && GameStateManager.Instance != null) + GameStateManager.Instance.m_OnStateChanged.RemoveListener(OnGameStateChange); } [Button] diff --git a/Assets/Scripts/GameState/GameStateManager.cs b/Assets/Scripts/GameState/GameStateManager.cs index bd1e06314..ea4fc8e1b 100644 --- a/Assets/Scripts/GameState/GameStateManager.cs +++ b/Assets/Scripts/GameState/GameStateManager.cs @@ -10,6 +10,7 @@ using Sirenix.OdinInspector; using SRF.Components; using UnityEngine; using UnityEngine.Events; +using UnityEngine.SceneManagement; namespace Beyond { @@ -50,6 +51,7 @@ namespace Beyond } private static GameStateManager s_instance = null; + private static bool s_isDestroyed = false; private float m_enemyDamageModifier = 1f; public SaveData m_saveData = new(); private HashSet m_CompabStates; @@ -63,6 +65,11 @@ namespace Beyond { return s_instance; } + else if (s_isDestroyed) + { + //don't recreate object after scene destorys it + return null; + } else { var inst = FindObjectOfType(); @@ -80,7 +87,13 @@ namespace Beyond return s_instance; } } - + //public void OnSc + public override void OnDestroy() + { + base.OnDestroy(); + s_isDestroyed = true; + // Debug.Log("Destroying GameStateManager"); + } //[ShowInInspector] public Difficulty GameDifficulty => m_saveData.difficulty; @@ -95,7 +108,7 @@ namespace Beyond Destroy(this); return; } - + SceneManager.sceneLoaded += SceneManager_sceneUnloaded; s_instance = this; //SetDifficulty(Difficulty.NORMAL); m_CompabStates = new HashSet(); @@ -109,6 +122,11 @@ namespace Beyond m_IdleStates.Add("Flee"); m_IdleStates.Add("Patrol"); } + //reset isDestroyed, so object can be recreated for the next scene + private void SceneManager_sceneUnloaded(Scene arg0, LoadSceneMode arg1) + { + s_isDestroyed = false; + } public enum State { diff --git a/Assets/Scripts/Healing/HealAnimator.cs b/Assets/Scripts/Healing/HealAnimator.cs index 74025aa65..af491a3bf 100644 --- a/Assets/Scripts/Healing/HealAnimator.cs +++ b/Assets/Scripts/Healing/HealAnimator.cs @@ -23,7 +23,7 @@ namespace Beyond return; } m_bendEffectMax = m_material.GetFloat("_BendEffect"); - m_initialColor = m_material.GetColor("BaseColor"); + m_initialColor = m_material.GetColor("_BaseColor"); } protected override void Start() @@ -43,7 +43,7 @@ namespace Beyond { base.Heal(); m_material.DOFloat(0f, "_BendEffect", m_healTime).SetEase(m_easeType); - m_material.DOColor(m_targetColor, "BaseColor", m_healTime); + m_material.DOColor(m_targetColor, "_BaseColor", m_healTime); } @@ -52,7 +52,7 @@ namespace Beyond { base.Unheal(); m_material.DOFloat(m_bendEffectMax, "_BendEffect", m_healTime);//.SetEase(Ease.InOutElastic); - m_material.DOColor(m_initialColor, "BaseColor", m_healTime); + m_material.DOColor(m_initialColor, "_BaseColor", m_healTime); } // Update is called once per frame diff --git a/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs b/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs index e221b6069..e57789fd2 100644 --- a/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs +++ b/Assets/Scripts/InvectorDerivatives/bThirdPersonController.cs @@ -9,7 +9,7 @@ namespace Beyond { public class bThirdPersonController : vThirdPersonController { - public bool triggerDieBehaviour = false; + //public bool triggerDieBehaviour = false; protected bool m_isDashing; protected bool m_GodMode = false; @@ -208,7 +208,8 @@ namespace Beyond base.OnTriggerExit(other); } - + //animation event handling + void DrawWeaponLowLeft() { } } } \ No newline at end of file diff --git a/Assets/Scripts/PostProcessController.cs b/Assets/Scripts/PostProcessController.cs index d7f42b07a..874e5b47d 100644 --- a/Assets/Scripts/PostProcessController.cs +++ b/Assets/Scripts/PostProcessController.cs @@ -26,7 +26,7 @@ public class PostProcessController : MonoBehaviour // Funkcja p�ynnie w��cza efekt post-processingu (od 0 do 1) w czasie ustawionym w duration public void EnablePostProcessing() { - if (volume != null) + if (volume != null && isActiveAndEnabled) { // Je�li ju� jest jaka� coroutina w trakcie, zatrzymujemy j� if (currentCoroutine != null) diff --git a/Assets/Scripts/Save/TreesSaver.cs b/Assets/Scripts/Save/TreesSaver.cs index c62b40e64..9430901ed 100644 --- a/Assets/Scripts/Save/TreesSaver.cs +++ b/Assets/Scripts/Save/TreesSaver.cs @@ -23,6 +23,10 @@ namespace Beyond if (i < treesStateData.Count) { treeControllers[i].health = treesStateData[i].health; + if (!treeControllers[i].isActiveAndEnabled && treesStateData[i].isEnabled) + { + treeControllers[i].gameObject.SetActiveUpHierarchy(true); + } treeControllers[i].SetTreeStateInstant(treesStateData[i].treeState); } } @@ -31,7 +35,7 @@ namespace Beyond public override string RecordData() { List treesStateData = new(); - treeControllers.ForEach(controller => treesStateData.Add(new TreeStateData(controller.currentTreeState, controller.health))); + treeControllers.ForEach(controller => treesStateData.Add(new TreeStateData(controller.currentTreeState, controller.health, controller.isActiveAndEnabled))); TreesDataContainer treesDataContainer = new(); treesDataContainer.treesData = treesStateData; Debug.Log(treesStateData.Count); diff --git a/Assets/Scripts/Skills/TreeSpotController.cs b/Assets/Scripts/Skills/TreeSpotController.cs index 4eaed3ddd..95611a914 100644 --- a/Assets/Scripts/Skills/TreeSpotController.cs +++ b/Assets/Scripts/Skills/TreeSpotController.cs @@ -34,11 +34,13 @@ namespace Beyond { public TreeState treeState; public float health = 100; + public bool isEnabled = true; - public TreeStateData(TreeState treeState, float health) + public TreeStateData(TreeState treeState, float health, bool isEnabled) { this.treeState = treeState; this.health = health; + this.isEnabled = isEnabled; } } @@ -73,8 +75,8 @@ namespace Beyond [SerializeField] private List woodRenderers, leavesRenderers; private List woodMaterials = new(), leavesMaterials = new(); - private string woodColorName = "BaseColor", - leavesColorName = "BaseColor"; + private string woodColorName = "_BaseColor", + leavesColorName = "_BaseColor"; [SerializeField] public bItemListData items; @@ -251,13 +253,17 @@ namespace Beyond } currentTreeState = treeState; - if (instant) + //TODO make sure that is enough to deal with saved state and disabled trees + if (gameObject.activeInHierarchy) { - StartCoroutine(SetInstantTreeSizeCoroutine(animationValue, animationName, animLayer)); - } - else - { - StartCoroutine(SetAnimationTreeCoroutine(animationValue, animationName, animLayer)); + if (instant) + { + StartCoroutine(SetInstantTreeSizeCoroutine(animationValue, animationName, animLayer)); + } + else + { + StartCoroutine(SetAnimationTreeCoroutine(animationValue, animationName, animLayer)); + } } onStateChanged?.Invoke(currentTreeState); diff --git a/Assets/Scripts/Triggers/ColliderEventTrigger.cs b/Assets/Scripts/Triggers/ColliderEventTrigger.cs index b23f189d7..4b72bd735 100644 --- a/Assets/Scripts/Triggers/ColliderEventTrigger.cs +++ b/Assets/Scripts/Triggers/ColliderEventTrigger.cs @@ -61,7 +61,7 @@ namespace Beyond { _reEnable = true; events.onEnable?.Invoke(); - Debug.Log("ColliderEventTrigger OnEnable"); + //Debug.Log("ColliderEventTrigger OnEnable"); } } diff --git a/Assets/Scripts/UI/ConsumablesButtonController.cs b/Assets/Scripts/UI/ConsumablesButtonController.cs index cc871593b..e1e06f241 100644 --- a/Assets/Scripts/UI/ConsumablesButtonController.cs +++ b/Assets/Scripts/UI/ConsumablesButtonController.cs @@ -61,7 +61,7 @@ namespace Beyond { return; } - Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name); + //Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name); //if current button type is gemstone, check if button should be active m_currentWeapon = area.currentEquippedItem; m_weaponPowerAttribute = m_currentWeapon.GetItemAttribute(bItemAttributes.Power); @@ -76,7 +76,7 @@ namespace Beyond { return; } - Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name); + //Debug.Log("On Unequiped weapon in area: "+area.name+" weapon: "+weapon.name); if (m_currentWeaponGemable && weapon.GetItemAttribute(bItemAttributes.Power) !=null) { m_currentWeaponGemable = false; diff --git a/Assets/Scripts/UI/UIImageFader.cs b/Assets/Scripts/UI/UIImageFader.cs index 9f6baab69..0b7ba7c5d 100644 --- a/Assets/Scripts/UI/UIImageFader.cs +++ b/Assets/Scripts/UI/UIImageFader.cs @@ -27,7 +27,7 @@ public class UIImageFader : MonoBehaviour // Method to start the fade process public void StartFade() { - if (!isFading) + if (!isFading && gameObject.activeInHierarchy && enabled) { StartCoroutine(FadeRoutine()); } diff --git a/Assets/Scripts/Utils/Editor/DebugLoggerInitializer.cs b/Assets/Scripts/Utils/Editor/DebugLoggerInitializer.cs index 6872876ad..ee18af5f5 100644 --- a/Assets/Scripts/Utils/Editor/DebugLoggerInitializer.cs +++ b/Assets/Scripts/Utils/Editor/DebugLoggerInitializer.cs @@ -5,8 +5,9 @@ using UnityEngine; namespace Beyond { + [InitializeOnLoad] - public class DebugLoggerInitializer + public class DebugLoggerInitializer : MonoBehaviour { /* static DebugLoggerInitializer() diff --git a/Assets/Scripts/Utils/Extensions.cs b/Assets/Scripts/Utils/Extensions.cs index be30309b0..3407523a4 100644 --- a/Assets/Scripts/Utils/Extensions.cs +++ b/Assets/Scripts/Utils/Extensions.cs @@ -32,7 +32,16 @@ namespace Beyond component = g.GetComponentInChildren(); return component; } - */ + */ + public static void SetActiveUpHierarchy(this GameObject g, bool active) + { + g.SetActive(active); + if (g.transform.parent) + { + SetActiveUpHierarchy(g.transform.parent.gameObject, active); + } + } + public static T FindComponentDownHierarchy(this GameObject g) where T : Component { T component; diff --git a/Assets/Scripts/Video/VideoCutsceneController.cs b/Assets/Scripts/Video/VideoCutsceneController.cs index 215646ed0..c1c06495b 100644 --- a/Assets/Scripts/Video/VideoCutsceneController.cs +++ b/Assets/Scripts/Video/VideoCutsceneController.cs @@ -41,7 +41,7 @@ namespace Beyond public bool m_dontEnableUI = false; private static VideoCutsceneController s_instance; - private static bool m_wasLoaded = false; + //private static bool m_wasLoaded = false; private const string RESOURCE_PATH = "Prefabs/VideoCutsceneCanvas Variant"; public static VideoCutsceneController Instance @@ -65,7 +65,7 @@ namespace Beyond var resource = Resources.Load(RESOURCE_PATH); if (resource) { - m_wasLoaded = true; + //m_wasLoaded = true; var gameobject = Instantiate(resource); if (gameobject) { diff --git a/Assets/Shaders/BeyondLit.shadergraph b/Assets/Shaders/BeyondLit.shadergraph index 98602161c..edd7f4d80 100644 --- a/Assets/Shaders/BeyondLit.shadergraph +++ b/Assets/Shaders/BeyondLit.shadergraph @@ -7489,7 +7489,7 @@ "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "BaseColor", "m_DefaultReferenceName": "BaseColor", - "m_OverrideReferenceName": "", + "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", diff --git a/Assets/Shaders/BeyondLitDoubleSided.shadergraph b/Assets/Shaders/BeyondLitDoubleSided.shadergraph index 11a9f43b8..8e7c0a2db 100644 --- a/Assets/Shaders/BeyondLitDoubleSided.shadergraph +++ b/Assets/Shaders/BeyondLitDoubleSided.shadergraph @@ -4594,7 +4594,7 @@ "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "BaseColor", "m_DefaultReferenceName": "BaseColor", - "m_OverrideReferenceName": "", + "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", diff --git a/Assets/Shaders/BeyondLitFade.shadergraph b/Assets/Shaders/BeyondLitFade.shadergraph index e91072307..2f440ef4f 100644 --- a/Assets/Shaders/BeyondLitFade.shadergraph +++ b/Assets/Shaders/BeyondLitFade.shadergraph @@ -5752,7 +5752,7 @@ "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "BaseColor", "m_DefaultReferenceName": "BaseColor", - "m_OverrideReferenceName": "", + "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", diff --git a/Assets/Shaders/BeyondLitTransparent.shadergraph b/Assets/Shaders/BeyondLitTransparent.shadergraph index 2619d0f12..c918ba153 100644 --- a/Assets/Shaders/BeyondLitTransparent.shadergraph +++ b/Assets/Shaders/BeyondLitTransparent.shadergraph @@ -6914,7 +6914,7 @@ "m_DefaultRefNameVersion": 1, "m_RefNameGeneratedByDisplayName": "BaseColor", "m_DefaultReferenceName": "BaseColor", - "m_OverrideReferenceName": "", + "m_OverrideReferenceName": "_BaseColor", "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", diff --git a/Assets/ThirdParty/FluXY/CHANGELOG.txt b/Assets/ThirdParty/FluXY/CHANGELOG.txt index 121fbe033..f831d2fe9 100644 --- a/Assets/ThirdParty/FluXY/CHANGELOG.txt +++ b/Assets/ThirdParty/FluXY/CHANGELOG.txt @@ -2,6 +2,11 @@ All notable changes to “FluXY - 2.5D fluid simulator†will be documented in this file. +## [1.4.1] - 2023-06-20 + +### Fixed +- "Blit material FluidSimulation uses dest texture as input" error in Unity 2022. + ## [1.4] - 2022-11-28 ### Added diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Flipbooks/FireFlipbook.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Flipbooks/FireFlipbook.mat index a8461329e..d496d5c06 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Flipbooks/FireFlipbook.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Flipbooks/FireFlipbook.mat @@ -41,11 +41,11 @@ Material: - _FrameCount: 32 m_Floats: - _Additiveness: 0.4 - - _DetailAdvection: 0.582 + - _DetailAdvection: 0.5 - _Duration: 2 - _Falloff: 0.2 - _Interpolation: 1 - - _InvFade: 7.76 + - _InvFade: 1 - _PlaybackOffset: 0 - _PlaybackSpeed: 1 m_Colors: [] diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Checker.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Checker.mat index c6cf38dc5..8ea296771 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Checker.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Checker.mat @@ -2,21 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Checker - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -65,28 +63,12 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnvironmentReflections: 1 @@ -112,7 +94,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_BuildTextureStacks: [] --- !u!114 &4867376423469122306 MonoBehaviour: m_ObjectHideFlags: 11 @@ -125,4 +106,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 1 diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Fog.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Fog.mat index f3d6a34e6..e52c990d0 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Fog.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Fog.mat @@ -2,16 +2,14 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Fog m_Shader: {fileID: 4800000, guid: ac39d2e3d512e4c7e9e69c2a398d0410, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: - - _LIGHTSOURCE_DIRECTIONAL + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -26,7 +24,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Detail: - m_Texture: {fileID: 2800000, guid: dc9686736bbe940ecb6bad0b65c14d04, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -65,19 +63,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - - _Additiveness: 0.231 + - _Additiveness: 0 - _BumpScale: 1 - _Cutoff: 0.5 - - _DetailAdvection: 0.723 + - _DetailAdvection: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Falloff: 0.631 + - _Falloff: 0.4 - _GlossMapScale: 1 - _Glossiness: 0.361 - _GlossyReflections: 1 - - _InvFade: 1.07 + - _InvFade: 1 - _Metallic: 0 - _Mode: 0 - _MotionBlur: 1 @@ -91,4 +88,3 @@ Material: m_Colors: - _Color: {r: 0.735849, g: 0.735849, b: 0.735849, a: 0.7647059} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Guy.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Guy.mat index 8506b75b8..21275b474 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Guy.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Guy.mat @@ -2,21 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Guy - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -65,28 +63,12 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnvironmentReflections: 1 @@ -112,7 +94,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_BuildTextureStacks: [] --- !u!114 &7453540739763953152 MonoBehaviour: m_ObjectHideFlags: 11 @@ -125,4 +106,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 5 + version: 1 diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Piece.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Piece.mat index dbc851854..6b690774d 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Piece.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/Piece.mat @@ -1,43 +1,24 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-9175737683816143566 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 5 --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Piece - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -74,35 +55,11 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - - _AlphaClip: 0 - - _Blend: 0 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -110,19 +67,11 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _Surface: 0 - _UVSec: 0 - - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.49056596, g: 0.37749287, b: 0.27536485, a: 1} - - _Color: {r: 0.49056596, g: 0.37749285, b: 0.27536482, a: 1} + - _Color: {r: 0.49056602, g: 0.3774929, b: 0.27536488, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP ToxicWaste.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP ToxicWaste.mat index dac361247..1d8dce5aa 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP ToxicWaste.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP ToxicWaste.mat @@ -15,7 +15,7 @@ MonoBehaviour: version: 5 --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -23,9 +23,7 @@ Material: m_Name: URP ToxicWaste m_Shader: {fileID: -6465566751694194690, guid: 34b9cd94cbb1d44549f707fb76ba499d, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: - - _LIGHTSOURCE_NONE + m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -113,14 +111,14 @@ Material: - Vector1_315F66DC: 1 - Vector1_32ADC857: 0.5 - Vector1_4AA7C398: 0 - - Vector1_4E55263A: 0.853 + - Vector1_4E55263A: 1 - Vector1_89BD7D39: 1 - Vector1_9E3307DE: 15 - Vector1_A6321E6B: 2.5 - Vector1_A668B339: 1 - Vector1_A6DF0022: 0.04 - Vector1_A8D33A48: -0.5 - - Vector1_D30E0CD7: 0.306 + - Vector1_D30E0CD7: 0.15 - Vector1_EA533925: 2 - _Additiveness: 0 - _BumpScale: 1 @@ -142,13 +140,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _TileIndex: 1.25 + - _TileIndex: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - Color_3D2DB61D: {r: 0.3018868, g: 0.008354024, b: 0, a: 1} - - Color_9E182C8D: {r: 1, g: 0, b: 0, a: 1} - - Color_C1C04D3: {r: 0.4056604, g: 0, b: 0.051067144, a: 1} + - Color_3D2DB61D: {r: 0.6294432, g: 0.7169812, b: 0.23335709, a: 1} + - Color_9E182C8D: {r: 1, g: 1, b: 1, a: 1} + - Color_C1C04D3: {r: 0.7113185, g: 0.9150943, b: 0.17697577, a: 1} - Color_DFEE58AE: {r: 0.7216981, g: 1, b: 0.98114526, a: 0.3882353} - Vector2_73BFA364: {r: 0, g: 0, b: 0, a: 0} - Vector2_7D6FBF77: {r: 4, g: 4, b: 0, a: 0} diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat index 48698c35d..e7378d8cb 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricFog.mat @@ -12,8 +12,7 @@ Material: type: 3} m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - - _LIGHTSOURCE_DIRECTIONAL - - _NOISE_ON + - _LIGHTSOURCE_POINT - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -99,17 +98,17 @@ Material: m_Floats: - Vector1_262E5DD6: 1 - Vector1_3FEA0E54: 0 - - Vector1_837DA489: 22.3 + - Vector1_837DA489: 16 - Vector1_9808C570: 1 - - Vector1_9E6B6241: 18 - - Vector1_C4967509: 34.8 - - Vector1_E676DA21: 26.42 - - Vector1_F3B7B00E: 19.21 + - Vector1_9E6B6241: 8 + - Vector1_C4967509: 0.2 + - Vector1_E676DA21: 8 + - Vector1_F3B7B00E: 4 - _AlphaClip: 0 - _Blend: 1 - _BumpScale: 1 - _CastShadows: 1 - - _Cull: 1 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 @@ -119,7 +118,7 @@ Material: - _LIGHTSOURCE: 1 - _Metallic: 0 - _Mode: 0 - - _NOISE: 1 + - _NOISE: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueControl: 0 @@ -132,19 +131,19 @@ Material: - _ZTest: 8 - _ZWrite: 0 - _ZWriteControl: 0 - - _densityThreshold: 0.953 - - _noiseAdvectSpeed: 5.21 + - _densityThreshold: 0.001 + - _noiseAdvectSpeed: 1 - _noiseAdvectTime: 0.5 - - _noisePow: 4.74 - - _noiseScale: 22.2 - - _shadowThreshold: 0.129 - - _volumeExtrusion: 0.39 - - _volumeFalloff: 1.222 + - _noisePow: 3 + - _noiseScale: 20 + - _shadowThreshold: 0.1 + - _volumeExtrusion: 1 + - _volumeFalloff: 0.15 - _volumeOffset: 1 m_Colors: - Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1} - - Color_753F6498: {r: 0.12996809, g: 0.7169812, b: 0.064257726, a: 1} - - Color_BE47E8B5: {r: 0.0018689941, g: 0.05660379, b: 0.005924961, a: 0.972549} + - Color_753F6498: {r: 0.16700785, g: 0.22076505, b: 0.254717, a: 1} + - Color_BE47E8B5: {r: 0.754717, g: 0.29547882, b: 0.75103265, a: 0.972549} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricLogo.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricLogo.mat index c70295fc0..8c0db2732 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricLogo.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricLogo.mat @@ -11,9 +11,8 @@ Material: m_Shader: {fileID: -6465566751694194690, guid: ef381005b8a834c9fa2733d96c543d31, type: 3} m_ValidKeywords: - - _ALPHATEST_ON + - _ALPHAPREMULTIPLY_ON - _LIGHTSOURCE_DIRECTIONAL - - _NOISE_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -99,14 +98,14 @@ Material: m_Floats: - Vector1_262E5DD6: 1 - Vector1_3FEA0E54: 0 - - Vector1_837DA489: 20.4 + - Vector1_837DA489: 12 - Vector1_9808C570: 1 - - Vector1_9E6B6241: 37 - - Vector1_C4967509: -3.17 - - Vector1_E676DA21: 21.04 - - Vector1_F3B7B00E: 43.12 - - _AlphaClip: 1 - - _Blend: 0 + - Vector1_9E6B6241: 12 + - Vector1_C4967509: 0.5 + - Vector1_E676DA21: 20 + - Vector1_F3B7B00E: 2 + - _AlphaClip: 0 + - _Blend: 1 - _BumpScale: 1 - _CastShadows: 1 - _Cull: 2 @@ -119,32 +118,32 @@ Material: - _LIGHTSOURCE: 1 - _Metallic: 0 - _Mode: 0 - - _NOISE: 1 + - _NOISE: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _QueueControl: 0 - _QueueOffset: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _Surface: 1 - _UVSec: 0 - _ZTest: 8 - _ZWrite: 0 - _ZWriteControl: 0 - - _densityThreshold: 0.799 - - _noiseAdvectSpeed: -0.16 + - _densityThreshold: 0.01 + - _noiseAdvectSpeed: 0.5 - _noiseAdvectTime: 1 - - _noisePow: 1.3 + - _noisePow: 3 - _noiseScale: 4 - - _shadowThreshold: 0.309 - - _volumeExtrusion: 0.768 - - _volumeFalloff: 0.57 - - _volumeOffset: 0.057 + - _shadowThreshold: 0.1 + - _volumeExtrusion: 0.5 + - _volumeFalloff: 0.5 + - _volumeOffset: 0.5 m_Colors: - Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1} - - Color_753F6498: {r: 0.46226418, g: 0.18543416, b: 0.0021804967, a: 1} - - Color_BE47E8B5: {r: 0.4245283, g: 0.17613408, b: 0, a: 0.972549} + - Color_753F6498: {r: 0.33922213, g: 0.6011469, b: 0.7264151, a: 1} + - Color_BE47E8B5: {r: 0.5754717, g: 0.45293194, b: 0.36102706, a: 0.972549} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricSmoke.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricSmoke.mat index af9cb1f29..3f415ffdb 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricSmoke.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP VolumetricSmoke.mat @@ -12,7 +12,7 @@ Material: type: 3} m_ValidKeywords: - _ALPHAPREMULTIPLY_ON - - _LIGHTSOURCE_NONE + - _LIGHTSOURCE_POINT - _NOISE_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -99,12 +99,12 @@ Material: m_Floats: - Vector1_262E5DD6: 1 - Vector1_3FEA0E54: 0 - - Vector1_837DA489: 9.9 + - Vector1_837DA489: 12 - Vector1_9808C570: 1 - - Vector1_9E6B6241: 38.9 + - Vector1_9E6B6241: 8 - Vector1_C4967509: 4 - Vector1_E676DA21: 30 - - Vector1_F3B7B00E: 4.23 + - Vector1_F3B7B00E: 4 - _AlphaClip: 0 - _Blend: 1 - _BumpScale: 1 @@ -143,8 +143,8 @@ Material: - _volumeOffset: 0.5 m_Colors: - Color_68344F06: {r: 0.35866857, g: 0.4517726, b: 0.49056602, a: 1} - - Color_753F6498: {r: 0.46070668, g: 0.47495696, b: 0.4811321, a: 1} - - Color_BE47E8B5: {r: 0.5849056, g: 0.2683053, b: 0, a: 0.972549} + - Color_753F6498: {r: 0.13527946, g: 0.25190458, b: 0.3018868, a: 1} + - Color_BE47E8B5: {r: 0.7264151, g: 0.4958822, b: 0.29810432, a: 0.972549} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP Water.mat b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP Water.mat index 3851424a2..afd4d3227 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP Water.mat +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Materials/URP Water.mat @@ -15,7 +15,7 @@ MonoBehaviour: version: 5 --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -23,11 +23,9 @@ Material: m_Name: URP Water m_Shader: {fileID: -6465566751694194690, guid: 1940d71d1af574d38b552638ff25c9ad, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: - - _LIGHTSOURCE_NONE + m_ShaderKeywords: m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 + m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -101,20 +99,20 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - Vector1_2934D119: 20.45 + - Vector1_2934D119: 0.5 - Vector1_315F66DC: 1 - - Vector1_32ADC857: 26.3 - - Vector1_4AA7C398: 0.279 - - Vector1_4F638F23: -0.5 + - Vector1_32ADC857: 1 + - Vector1_4AA7C398: 0 + - Vector1_4F638F23: -0.25 - Vector1_5F6501F5: 0 - Vector1_74E26674: 0.5 - - Vector1_89BD7D39: 0.86 - - Vector1_8F171F43: 0.2 - - Vector1_A6321E6B: 1.17 - - Vector1_A668B339: 0.294 - - Vector1_A6DF0022: 0.25 - - Vector1_D183151F: 0.7 - - Vector1_F22C9906: 0.57 + - Vector1_89BD7D39: 1 + - Vector1_8F171F43: 0.1 + - Vector1_A6321E6B: 3 + - Vector1_A668B339: 0.5 + - Vector1_A6DF0022: 0.04 + - Vector1_D183151F: 4 + - Vector1_F22C9906: 2 - _Additiveness: 0 - _BumpScale: 1 - _Cutoff: 0.5 @@ -135,13 +133,13 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _TileIndex: 1.09 + - _TileIndex: 0 - _UVSec: 0 - _ZWrite: 1 m_Colors: - - Color_709ED842: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 0.6862745} - - Color_9E182C8D: {r: 0.3773585, g: 0.3773585, b: 0.3773585, a: 0.8784314} - - Color_DFEE58AE: {r: 1, g: 1, b: 1, a: 1} + - Color_709ED842: {r: 1, g: 1, b: 1, a: 0.9058824} + - Color_9E182C8D: {r: 0.23905303, g: 0.5591888, b: 0.6415094, a: 0.8352941} + - Color_DFEE58AE: {r: 0.6045301, g: 0.8962264, b: 0.82638365, a: 0.3882353} - Vector2_63614596: {r: 0.02, g: -0.1, b: 0, a: 0} - Vector2_78FB6B63: {r: 5, g: 5, b: 0, a: 0} - Vector2_7E649864: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/ThirdParty/FluXY/Samples/Resources/Shaders/URP/FluxyVolumetric.shadergraph b/Assets/ThirdParty/FluXY/Samples/Resources/Shaders/URP/FluxyVolumetric.shadergraph index 5fe2818da..d49567a42 100644 --- a/Assets/ThirdParty/FluXY/Samples/Resources/Shaders/URP/FluxyVolumetric.shadergraph +++ b/Assets/ThirdParty/FluXY/Samples/Resources/Shaders/URP/FluxyVolumetric.shadergraph @@ -261,6 +261,15 @@ }, { "m_Id": "c9b079fd494f4c8a99822b4a52a259b8" + }, + { + "m_Id": "ab1a481cdf564504b837ed7877f6663f" + }, + { + "m_Id": "30d04585da65453cbe3485a7156cd296" + }, + { + "m_Id": "4fad8de703eb41b583e500027c9bdfb6" } ], "m_GroupDatas": [ @@ -332,20 +341,6 @@ "m_SlotId": 0 } }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "2a5ca6696c530e8c874719b853083a48" - }, - "m_SlotId": 1 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "8eb325963471496fa92ad14e027cf020" - }, - "m_SlotId": 2 - } - }, { "m_OutputSlot": { "m_Node": { @@ -360,6 +355,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "30d04585da65453cbe3485a7156cd296" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4fad8de703eb41b583e500027c9bdfb6" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -402,6 +411,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4fad8de703eb41b583e500027c9bdfb6" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "8eb325963471496fa92ad14e027cf020" + }, + "m_SlotId": 2 + } + }, { "m_OutputSlot": { "m_Node": { @@ -696,6 +719,20 @@ "m_SlotId": 4 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ab1a481cdf564504b837ed7877f6663f" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4fad8de703eb41b583e500027c9bdfb6" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1929,6 +1966,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "1c8a8ac7ae0941b3991c2fe6a11379a2", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 1, "m_Type": "UnityEditor.ShaderGraph.ShaderKeyword", @@ -2224,6 +2285,44 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ViewVectorNode", + "m_ObjectId": "30d04585da65453cbe3485a7156cd296", + "m_Group": { + "m_Id": "" + }, + "m_Name": "View Vector", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2002.999755859375, + "y": 33.00000762939453, + "width": 206.0, + "height": 131.0 + } + }, + "m_Slots": [ + { + "m_Id": "5df6c952da824e288e634fe81979c48a" + }, + { + "m_Id": "81dcfd920a3d46c8b29dceb767fd69d0" + } + ], + "synonyms": [ + "eye vector" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", @@ -2818,6 +2917,48 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.AddNode", + "m_ObjectId": "4fad8de703eb41b583e500027c9bdfb6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Add", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1630.0, + "y": -82.00000762939453, + "width": 130.0, + "height": 118.00001525878906 + } + }, + "m_Slots": [ + { + "m_Id": "1c8a8ac7ae0941b3991c2fe6a11379a2" + }, + { + "m_Id": "5e65d8acebf044e08eda4eaaab4c9668" + }, + { + "m_Id": "de9e74eaad8f4bfbbfc9d0352a617b94" + } + ], + "synonyms": [ + "addition", + "sum", + "plus" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -3176,6 +3317,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "5df6c952da824e288e634fe81979c48a", + "m_Id": 3, + "m_DisplayName": "World Space Position", + "m_SlotType": 0, + "m_Hidden": true, + "m_ShaderOutputName": "WorldSpacePosition", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 2 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -3218,6 +3383,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5e65d8acebf044e08eda4eaaab4c9668", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -3469,6 +3658,29 @@ ] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "72e0664908974c2cb8f362df4ed9648b", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", @@ -3977,6 +4189,29 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "81dcfd920a3d46c8b29dceb767fd69d0", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5161,6 +5396,42 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.PositionNode", + "m_ObjectId": "ab1a481cdf564504b837ed7877f6663f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -2003.0, + "y": -117.0, + "width": 206.0, + "height": 131.00001525878907 + } + }, + "m_Slots": [ + { + "m_Id": "72e0664908974c2cb8f362df4ed9648b" + } + ], + "synonyms": [ + "location" + ], + "m_Precision": 1, + "m_PreviewExpanded": false, + "m_PreviewMode": 2, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Space": 0, + "m_PositionSource": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -6767,6 +7038,30 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "de9e74eaad8f4bfbbfc9d0352a617b94", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", diff --git a/Assets/ThirdParty/FluXY/Samples/URP VolumetricSmokeRing.unity b/Assets/ThirdParty/FluXY/Samples/URP VolumetricSmokeRing.unity index e7a2a5ce3..2f6a9c9e3 100644 --- a/Assets/ThirdParty/FluXY/Samples/URP VolumetricSmokeRing.unity +++ b/Assets/ThirdParty/FluXY/Samples/URP VolumetricSmokeRing.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1} + m_IndirectSpecularColor: {r: 0.12731712, g: 0.13414735, b: 0.12107852, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,294 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!108 &57470085 stripped -Light: - m_CorrespondingSourceObject: {fileID: 7890423132216670435, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - m_PrefabInstance: {fileID: 1572484607} - m_PrefabAsset: {fileID: 0} ---- !u!1 &74663018 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 6838a82f25c8e45cca01dd054c9105b2, - type: 3} - m_PrefabInstance: {fileID: 1647533620} - m_PrefabAsset: {fileID: 0} ---- !u!64 &74663022 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 74663018} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4068373912626513877, guid: 6838a82f25c8e45cca01dd054c9105b2, type: 3} ---- !u!114 &177504504 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 819492883, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - m_PrefabInstance: {fileID: 1572484607} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3027f475235a4f7ab39c90b4bbf8567, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &452314290 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 452314291} - - component: {fileID: 452314295} - - component: {fileID: 452314294} - - component: {fileID: 452314293} - - component: {fileID: 452314292} - m_Layer: 8 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &452314291 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 452314290} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 881483880} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &452314292 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 452314290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3027f475235a4f7ab39c90b4bbf8567, type: 3} - m_Name: - m_EditorClassIdentifier: - splatMaterial: {fileID: 2100000, guid: 644c5fbe7e0624b239c5c09b7d1613ae, type: 2} - rateOverSteps: 1 - rateOverTime: 0 - rateOverDistance: 0 - overridePosition: 0 - position: {x: 0, y: 0} - positionRandomness: 0 - overrideRotation: 1 - rotation: 0 - rotationRandomness: 0 - scaleWithDistance: 1 - scaleWithTransform: 0 - scale: {x: 0.4, y: 0.4} - scaleRandomness: 0 - velocityWeight: 1 - velocityTexture: {fileID: 0} - maxRelativeVelocity: 2 - velocityScale: {x: 1, y: 1, z: 0.25} - maxRelativeAngularVelocity: 12 - angularVelocityScale: 1 - force: {x: 0, y: 0, z: 0} - torque: 0 - densityWeight: 1 - densityTexture: {fileID: 2800000, guid: e110bd67048ea41b9910c3ea068ca09a, type: 3} - srcBlend: 1 - dstBlend: 1 - blendOp: 2 - color: {r: 0, g: 0, b: 0, a: 0} - noiseTexture: {fileID: 0} - densityNoise: 0 - densityNoiseOffset: 0 - densityNoiseTiling: 1 - velocityNoise: 0 - velocityNoiseOffset: 0 - velocityNoiseTiling: 1 ---- !u!135 &452314293 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 452314290} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &452314294 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 452314290} - m_Enabled: 0 - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &452314295 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 452314290} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &842891661 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 842891664} - - component: {fileID: 842891663} - m_Layer: 0 - m_Name: Target - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &842891663 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842891661} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3027f475235a4f7ab39c90b4bbf8567, type: 3} - m_Name: - m_EditorClassIdentifier: - splatMaterial: {fileID: 2100000, guid: 644c5fbe7e0624b239c5c09b7d1613ae, type: 2} - rateOverSteps: 1 - rateOverTime: 0 - rateOverDistance: 0 - overridePosition: 0 - position: {x: 0, y: 0} - positionRandomness: 0 - overrideRotation: 1 - rotation: 0 - rotationRandomness: 0 - scaleWithDistance: 0 - scaleWithTransform: 0 - scale: {x: 0.6, y: 0.6} - scaleRandomness: 0 - velocityWeight: 1 - velocityTexture: {fileID: 0} - maxRelativeVelocity: 8 - velocityScale: {x: 1, y: 1, z: 1} - maxRelativeAngularVelocity: 12 - angularVelocityScale: 1 - force: {x: 0, y: 0, z: 0} - torque: 2 - densityWeight: 0.1 - densityTexture: {fileID: 2800000, guid: 846868165698e472095588cd59d8ee1e, type: 3} - srcBlend: 1 - dstBlend: 10 - blendOp: 0 - color: {r: 0, g: 0.46844092, b: 0.8113208, a: 1} - noiseTexture: {fileID: 2800000, guid: ff70acd9d6132428b8cbea06fbf16801, type: 3} - densityNoise: 0.5 - densityNoiseOffset: 2 - densityNoiseTiling: 1 - velocityNoise: 8 - velocityNoiseOffset: 4 - velocityNoiseTiling: 0.5 ---- !u!4 &842891664 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842891661} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0.50000006} - m_LocalScale: {x: 1, y: 2, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1776579688} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &881483879 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7892267611028067171, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - m_PrefabInstance: {fileID: 1572484607} - m_PrefabAsset: {fileID: 0} ---- !u!4 &881483880 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7894515069204073721, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - m_PrefabInstance: {fileID: 1572484607} - m_PrefabAsset: {fileID: 0} ---- !u!135 &881483881 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 881483879} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!43 &985443089 +--- !u!43 &18057975 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -574,6 +287,85 @@ Mesh: offset: 0 size: 0 path: +--- !u!1 &842891661 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 842891664} + - component: {fileID: 842891663} + m_Layer: 0 + m_Name: Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &842891663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 842891661} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3027f475235a4f7ab39c90b4bbf8567, type: 3} + m_Name: + m_EditorClassIdentifier: + splatMaterial: {fileID: 2100000, guid: 644c5fbe7e0624b239c5c09b7d1613ae, type: 2} + rateOverSteps: 1 + rateOverTime: 0 + rateOverDistance: 0 + overridePosition: 0 + position: {x: 0, y: 0} + positionRandomness: 0 + overrideRotation: 1 + rotation: 0 + rotationRandomness: 0 + scaleWithDistance: 0 + scaleWithTransform: 0 + scale: {x: 0.6, y: 0.6} + scaleRandomness: 0 + velocityWeight: 1 + velocityTexture: {fileID: 0} + maxRelativeVelocity: 8 + velocityScale: {x: 1, y: 1, z: 1} + maxRelativeAngularVelocity: 12 + angularVelocityScale: 1 + force: {x: 0, y: 0, z: 0} + torque: 2 + densityWeight: 0.1 + densityTexture: {fileID: 2800000, guid: 846868165698e472095588cd59d8ee1e, type: 3} + srcBlend: 1 + dstBlend: 10 + blendOp: 0 + color: {r: 0, g: 0.46844092, b: 0.8113208, a: 1} + noiseTexture: {fileID: 2800000, guid: ff70acd9d6132428b8cbea06fbf16801, type: 3} + densityNoise: 0.5 + densityNoiseOffset: 2 + densityNoiseTiling: 1 + velocityNoise: 8 + velocityNoiseOffset: 4 + velocityNoiseTiling: 0.5 +--- !u!4 &842891664 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 842891661} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0.50000006} + m_LocalScale: {x: 1, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1776579688} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &994489006 GameObject: m_ObjectHideFlags: 0 @@ -607,7 +399,7 @@ MonoBehaviour: desiredResolution: 256 densitySupersampling: 2 disposeWhenCulled: 0 - readable: 0 + isReadable: 0 simulationMaterial: {fileID: 2100000, guid: 6dfe24573234e413ab0d0b5093141a3c, type: 2} maxTimestep: 0.008 maxSteps: 4 @@ -626,459 +418,126 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1218599290 stripped +--- !u!1 &1641042456 GameObject: - m_CorrespondingSourceObject: {fileID: 7892061002765174323, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - m_PrefabInstance: {fileID: 1572484607} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &1218599292 + serializedVersion: 6 + m_Component: + - component: {fileID: 1641042459} + - component: {fileID: 1641042458} + - component: {fileID: 1641042457} + - component: {fileID: 1641042460} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1641042457 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1641042456} + m_Enabled: 1 +--- !u!20 &1641042458 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1641042456} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1641042459 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1641042456} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.5, z: -5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1641042460 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218599290} + m_GameObject: {fileID: 1641042456} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3027f475235a4f7ab39c90b4bbf8567, type: 3} + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} m_Name: m_EditorClassIdentifier: - splatMaterial: {fileID: 2100000, guid: 644c5fbe7e0624b239c5c09b7d1613ae, type: 2} - rateOverSteps: 1 - rateOverTime: 0 - rateOverDistance: 0 - overridePosition: 0 - position: {x: 0, y: 0} - positionRandomness: 0 - overrideRotation: 1 - rotation: 0 - rotationRandomness: 0 - scaleWithDistance: 1 - scaleWithTransform: 0 - scale: {x: 0.4, y: 0.4} - scaleRandomness: 0 - velocityWeight: 1 - velocityTexture: {fileID: 0} - maxRelativeVelocity: 2 - velocityScale: {x: 1, y: 1, z: 0.25} - maxRelativeAngularVelocity: 12 - angularVelocityScale: 1 - force: {x: 0, y: 0, z: 0} - torque: 0 - densityWeight: 1 - densityTexture: {fileID: 2800000, guid: e110bd67048ea41b9910c3ea068ca09a, type: 3} - srcBlend: 1 - dstBlend: 1 - blendOp: 2 - color: {r: 0, g: 0, b: 0, a: 0} - noiseTexture: {fileID: 0} - densityNoise: 0 - densityNoiseOffset: 0 - densityNoiseTiling: 1 - velocityNoise: 0 - velocityNoiseOffset: 0 - velocityNoiseTiling: 1 ---- !u!136 &1218599293 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1218599290} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.62 - m_Height: 1.91 - m_Direction: 0 - m_Center: {x: 0.22, y: 0, z: 0} ---- !u!1001 &1572484607 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 69692970067422528, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971488966159, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971488966159, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971488966159, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971488966159, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971488966159, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971582168018, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971582168018, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971582168018, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971582168018, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971582168018, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971790028508, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971790028508, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971790028508, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971790028508, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 69692971790028508, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1369908312085179802, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1369908312085179802, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1369908312085179802, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1369908312085179802, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042748596281458125, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042748596281458125, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042748596281458125, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2042748596281458125, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2440003739781622993, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2440003739781622993, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2440003739781622993, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2440003739781622993, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2665758824221232597, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_Name - value: Player_02 - objectReference: {fileID: 0} - - target: {fileID: 2940189872444449484, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2940189872444449484, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2940189872444449484, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2940189872444449484, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4002499601089255556, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4002499601089255556, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4002499601089255556, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4002499601089255556, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4945866245177223892, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6413385879563089645, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6413385879563089645, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6413385879563089645, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6413385879563089645, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6702965901446419282, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6702965901446419282, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7890423132216670433, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.185 - objectReference: {fileID: 0} - - target: {fileID: 7890423132216670433, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.394 - objectReference: {fileID: 0} - - target: {fileID: 7890423132216670433, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.027 - objectReference: {fileID: 0} - - target: {fileID: 7890423132216670435, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_Type - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7890423132216670435, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_Range - value: 2.55 - objectReference: {fileID: 0} - - target: {fileID: 7892061002765174323, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_Layer - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7894858461104365837, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.x - value: 3.381 - objectReference: {fileID: 0} - - target: {fileID: 7894858461104365837, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.465 - objectReference: {fileID: 0} - - target: {fileID: 7894858461104365837, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_LocalPosition.z - value: -1.963 - objectReference: {fileID: 0} - - target: {fileID: 8277492519919735091, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8277492519919735091, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8277492519919735091, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8940276592975245528, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8940276592975245528, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8940276592975245528, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8940276592975245528, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8979334321368230603, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8979334321368230603, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8979334321368230603, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8979334321368230603, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8979334321368230603, guid: 430f1022474d8bd4a832e9c41341e518, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 430f1022474d8bd4a832e9c41341e518, type: 3} + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 1 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1001 &1647533620 PrefabInstance: m_ObjectHideFlags: 0 @@ -1089,7 +548,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: 6838a82f25c8e45cca01dd054c9105b2, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 6838a82f25c8e45cca01dd054c9105b2, type: 3} @@ -1174,7 +633,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1730786598 Transform: m_ObjectHideFlags: 0 @@ -1189,7 +648,7 @@ Transform: m_Children: - {fileID: 1879040459} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1730786599 MonoBehaviour: @@ -1263,15 +722,12 @@ MonoBehaviour: verticalBoundary: 0 velocityScale: 0 accelerationScale: 0 - positionOffset: {x: 0, y: 0} gravity: {x: 0, y: 0, z: 0} externalForce: {x: 0, y: 0, z: 0} - lightSource: {fileID: 57470085} + lightSource: {fileID: 1879040458} targets: - {fileID: 842891663} - - {fileID: 1218599292} - - {fileID: 452314292} - - {fileID: 177504504} + - {fileID: 0} pressure: 1 viscosity: 0.5 turbulence: 15 @@ -1329,7 +785,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1776579683} - m_Mesh: {fileID: 985443089} + m_Mesh: {fileID: 18057975} --- !u!4 &1776579688 Transform: m_ObjectHideFlags: 0 @@ -1344,7 +800,7 @@ Transform: m_Children: - {fileID: 842891664} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1879040456 GameObject: diff --git a/Assets/ThirdParty/FluXY/Scripts/FluxySolver.cs b/Assets/ThirdParty/FluXY/Scripts/FluxySolver.cs index a3504ccd7..f738108fe 100644 --- a/Assets/ThirdParty/FluXY/Scripts/FluxySolver.cs +++ b/Assets/ThirdParty/FluXY/Scripts/FluxySolver.cs @@ -400,6 +400,8 @@ namespace Fluxy } } + simulationMaterial.SetTexture("_MainTex", null); + RenderTexture.active = old; } diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs index 346f76197..6702e93ce 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs +++ b/Assets/ThirdParty/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonAnimator.cs @@ -16,7 +16,7 @@ namespace Invector.vCharacterController public const float walkSpeed = 0.5f; public const float runningSpeed = 1f; public const float sprintSpeed = 1.5f; - private bool triggerDieBehaviour; + public bool triggerDieBehaviour; public Vector3 lastCharacterPosition { get; protected set; } #endregion diff --git a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Animations/Melee_CombatSet.fbx.meta b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Animations/Melee_CombatSet.fbx.meta index 4a29f76e6..de2415912 100644 --- a/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Animations/Melee_CombatSet.fbx.meta +++ b/Assets/ThirdParty/Invector-3rdPersonController/Melee Combat/3DModels/Animations/Melee_CombatSet.fbx.meta @@ -1118,14 +1118,7 @@ ModelImporter: mirror: 0 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 curves: [] - events: - - time: 0.4514425 - functionName: NewEvent - data: - objectReferenceParameter: {instanceID: 0} - floatParameter: 0 - intParameter: 0 - messageOptions: 0 + events: [] transformMask: [] maskType: 3 maskSource: {instanceID: 0}