diff --git a/Assets/Meshes/Props/Mario_props/MATERIAL/Skeleton_Fabric.mat b/Assets/Meshes/Props/Mario_props/MATERIAL/Skeleton_Fabric.mat index 88c4b3955..215c420a5 100644 --- a/Assets/Meshes/Props/Mario_props/MATERIAL/Skeleton_Fabric.mat +++ b/Assets/Meshes/Props/Mario_props/MATERIAL/Skeleton_Fabric.mat @@ -181,7 +181,7 @@ Material: - BaseColor: {r: 1, g: 1, b: 1, a: 1} - Color_613d1588816440ec9b17710effb7528b: {r: 0, g: 13.98681, b: 714.8679, a: 0} - EmissiveColor: {r: 0, g: 0, b: 0, a: 0} - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 0.990566, g: 0.990566, b: 0.990566, a: 1} - _BendVector: {r: 0, g: -1, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Meshes/Terrain/Terrain_Land01.asset b/Assets/Meshes/Terrain/Terrain_Land01.asset index ec42de971..a415c81e8 100644 Binary files a/Assets/Meshes/Terrain/Terrain_Land01.asset and b/Assets/Meshes/Terrain/Terrain_Land01.asset differ diff --git a/Assets/Meshes/scroll/scrollRT.renderTexture b/Assets/Meshes/scroll/scrollRT.renderTexture index 2a68a2397..e11cd019a 100644 --- a/Assets/Meshes/scroll/scrollRT.renderTexture +++ b/Assets/Meshes/scroll/scrollRT.renderTexture @@ -12,8 +12,8 @@ RenderTexture: Hash: 00000000000000000000000000000000 m_IsAlphaChannelOptional: 0 serializedVersion: 6 - m_Width: 2778 - m_Height: 1284 + m_Width: 2532 + m_Height: 1170 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 0 diff --git a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity index 09504058d..d4e98b6b9 100644 --- a/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity +++ b/Assets/Scenes/Land_01/Land_Of_Death_Demo.unity @@ -20140,238 +20140,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1898206539} m_PrefabAsset: {fileID: 0} ---- !u!1001 &104080278 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 533552907717362349, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit6_8664 - objectReference: {fileID: 0} - - target: {fileID: 533552907717362349, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 533552907717362349, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 1671754395369262604, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit3_8292 - objectReference: {fileID: 0} - - target: {fileID: 1671754395369262604, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 1671754395369262604, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 3992334202473812567, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit7_8788 - objectReference: {fileID: 0} - - target: {fileID: 3992334202473812567, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 3992334202473812567, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onStateChanged.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1565036105} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onStateChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SendToMessageSystem - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onStateChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: PixelCrushers.QuestMachine.QuestControl, Assembly-CSharp-firstpass - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: TreeOfJustice:Planted - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150761, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: onFullyGrown.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150767, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_Name - value: Justice TreePlantingSpotForQuest - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150767, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalPosition.x - value: 195.7759 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalPosition.y - value: 29.12678 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalPosition.z - value: -112.66586 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4112471969828150773, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4655162871182192070, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit2_8168 - objectReference: {fileID: 0} - - target: {fileID: 4655162871182192070, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 4655162871182192070, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 6204786941266928578, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit1_8044 - objectReference: {fileID: 0} - - target: {fileID: 6204786941266928578, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 6204786941266928578, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 6750153495113154710, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit5_8540 - objectReference: {fileID: 0} - - target: {fileID: 6750153495113154710, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 6750153495113154710, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 7547780536117467975, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit8_8912 - objectReference: {fileID: 0} - - target: {fileID: 7547780536117467975, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 7547780536117467975, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 7847443688891906561, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit_7920 - objectReference: {fileID: 0} - - target: {fileID: 7847443688891906561, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 7847443688891906561, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - - target: {fileID: 8278850749456108504, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: m_key - value: Justicefruit4_8416 - objectReference: {fileID: 0} - - target: {fileID: 8278850749456108504, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 8278850749456108504, guid: 402d108d8c99c104c863eb0979032856, - type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 402d108d8c99c104c863eb0979032856, type: 3} --- !u!1 &104111639 GameObject: m_ObjectHideFlags: 0 @@ -22688,6 +22456,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 450558086} m_PrefabAsset: {fileID: 0} +--- !u!43 &114578824 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + 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_CookingOptions: 30 + 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 &114902985 GameObject: m_ObjectHideFlags: 0 @@ -30750,39 +30683,6 @@ MonoBehaviour: m_showTerrainOpsPanel: 0 m_terrainNamesFlaggedForRegeneration: [] m_terrainNamesFlaggedForRegenerationDeactivation: [] ---- !u!21 &164900276 -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_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3002 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: [] - m_Ints: [] - m_Floats: - - _HeightFogGlobal: 1 - - _IsHeightFogShader: 1 - - _IsStandardPipeline: 0 - - _TITLE: 1 - - _TransparentQueue: 3000 - m_Colors: [] - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1001 &165301020 PrefabInstance: m_ObjectHideFlags: 0 @@ -56137,171 +56037,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 308275622} m_PrefabAsset: {fileID: 0} ---- !u!43 &308906371 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - 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_CookingOptions: 30 - 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 &309759357 PrefabInstance: m_ObjectHideFlags: 0 @@ -118969,10 +118704,26 @@ PrefabInstance: propertyPath: m_faithCostPerSecond value: 5 objectReference: {fileID: 0} + - target: {fileID: 1639919912, guid: fbfa4fe7080216843b09436e3f6bacfa, type: 3} + propertyPath: indexList + value: 11 + objectReference: {fileID: 0} - target: {fileID: 1639919912, guid: fbfa4fe7080216843b09436e3f6bacfa, type: 3} propertyPath: mainTarget value: objectReference: {fileID: 569166460} + - target: {fileID: 1639919912, guid: fbfa4fe7080216843b09436e3f6bacfa, type: 3} + propertyPath: smoothSwitchSide + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1639919912, guid: fbfa4fe7080216843b09436e3f6bacfa, type: 3} + propertyPath: smoothBetweenState + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 1639919912, guid: fbfa4fe7080216843b09436e3f6bacfa, type: 3} + propertyPath: smoothCameraRotation + value: 8 + objectReference: {fileID: 0} - target: {fileID: 4373936794591310672, guid: fbfa4fe7080216843b09436e3f6bacfa, type: 3} propertyPath: m_RootOrder @@ -152734,6 +152485,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 249f153543576874e84df57b8bb314cd, type: 3} +--- !u!43 &880017814 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FluidContainer + serializedVersion: 11 + 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_CookingOptions: 30 + 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 &880188394 PrefabInstance: m_ObjectHideFlags: 0 @@ -216225,171 +216141,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1134728514} m_PrefabAsset: {fileID: 0} ---- !u!43 &1236307536 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FluidContainer - serializedVersion: 11 - 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_CookingOptions: 30 - 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 &1236420576 GameObject: m_ObjectHideFlags: 0 @@ -222323,6 +222074,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 699245897} m_PrefabAsset: {fileID: 0} +--- !u!21 &1272719031 +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_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: [] + m_Ints: [] + m_Floats: + - _HeightFogGlobal: 1 + - _IsHeightFogShader: 1 + - _IsStandardPipeline: 0 + - _TITLE: 1 + - _TransparentQueue: 3000 + m_Colors: [] + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!4 &1273062743 stripped Transform: m_CorrespondingSourceObject: {fileID: 5453267778130938655, guid: fe91b44cb15078e40bcfe633f6eb1a24, @@ -227286,6 +227070,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f83636a48749aab44b788da2693408a5, type: 3} +--- !u!21 &1311052360 +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_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: [] + m_AllowLocking: 1 --- !u!1 &1312189023 GameObject: m_ObjectHideFlags: 0 @@ -300923,70 +300771,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1754879945} m_PrefabAsset: {fileID: 0} ---- !u!21 &1754969526 -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_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - 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: [] - m_AllowLocking: 1 --- !u!1 &1755142727 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5347464428523272410, guid: 003daaab58a32ca419f0a3ef3dbef864, @@ -488564,7 +488348,6 @@ SceneRoots: m_Roots: - {fileID: 7162762999663110545} - {fileID: 1654353394} - - {fileID: 104080278} - {fileID: 835359607} - {fileID: 342855243} - {fileID: 935141547} diff --git a/Assets/Scripts/Invector/vShooterMelee@CameraState Player.asset b/Assets/Scripts/Invector/vShooterMelee@CameraState Player.asset index acea64a36..67b697313 100644 --- a/Assets/Scripts/Invector/vShooterMelee@CameraState Player.asset +++ b/Assets/Scripts/Invector/vShooterMelee@CameraState Player.asset @@ -22,7 +22,7 @@ MonoBehaviour: minDistance: 0.6 height: 1.72 smooth: 5 - smoothDamp: 1 + smoothDamp: 2 xMouseSensitivity: 4 yMouseSensitivity: 2 yMinLimit: -45 @@ -290,7 +290,7 @@ MonoBehaviour: - Name: Combat forward: -1 right: 0.4 - defaultDistance: 6 + defaultDistance: 5 maxDistance: 7 minDistance: 5 height: 2.5 @@ -302,7 +302,7 @@ MonoBehaviour: yMaxLimit: 38.007957 xMinLimit: -360 xMaxLimit: 360 - rotationOffSet: {x: 18, y: 0, z: 0} + rotationOffSet: {x: 20, y: 0, z: 0} cullingHeight: 0.25 cullingMinDist: 0.1 fov: 65 @@ -313,20 +313,20 @@ MonoBehaviour: - Name: Tree forward: -1 right: 0.13 - defaultDistance: 8 + defaultDistance: 5.65 maxDistance: 12 minDistance: 6 - height: 2.5 - smooth: 5 - smoothDamp: 1 + height: 6.4 + smooth: 8 + smoothDamp: 8 xMouseSensitivity: 4 yMouseSensitivity: 2 yMinLimit: -45 yMaxLimit: 45 xMinLimit: -360 xMaxLimit: 360 - rotationOffSet: {x: 5, y: 0, z: 0} - cullingHeight: 2.31 + rotationOffSet: {x: 23.4, y: 0, z: 0} + cullingHeight: 2.71 cullingMinDist: 0.01 fov: 59.5 useZoom: 0