From 8d7e4b041f4014bbc0a9e787b51ba941464a4a5b Mon Sep 17 00:00:00 2001 From: marcin Date: Wed, 1 Oct 2025 17:22:12 +0200 Subject: [PATCH] main quest and good soil quest added back to wasteland --- .../Scenes/00_Fight_Arena/Fight_Arena.unity | 16 +- Assets/Scenes/01_Wasteland/Wasteland.unity | 798 +++++++++++++++--- Assets/Scenes/Old_Levels!/TestHub.unity | 167 ++-- .../2H_Weapon/Materials/Adam_body_Metal.mat | 7 +- .../2H_Weapon/Materials/Adam_head_metal.mat | 7 +- .../2H_Weapon/Materials/Eva_Body_Metal.mat | 7 +- .../2H_Weapon/Materials/Eva_Head_Metal.mat | 7 +- .../2H_Weapon/Materials/Helmet.mat | 7 +- .../2H_Weapon/Materials/Sword.mat | 7 +- .../Materials/Eva_Body_Metal.mat | 7 +- .../Materials/Eva_Head_Metal.mat | 7 +- .../FluXY/Resources/Materials/Splat.mat | 4 +- ProjectSettings/EditorBuildSettings.asset | 6 +- ProjectSettings/ProjectSettings.asset | 6 +- 14 files changed, 806 insertions(+), 247 deletions(-) diff --git a/Assets/Scenes/00_Fight_Arena/Fight_Arena.unity b/Assets/Scenes/00_Fight_Arena/Fight_Arena.unity index 466153a57..a37b3a7d5 100644 --- a/Assets/Scenes/00_Fight_Arena/Fight_Arena.unity +++ b/Assets/Scenes/00_Fight_Arena/Fight_Arena.unity @@ -17125,7 +17125,7 @@ PrefabInstance: - target: {fileID: 3749252306457878305, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: -26.000183 + value: -26.000244 objectReference: {fileID: 0} - target: {fileID: 3806889720075550842, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -18122,6 +18122,11 @@ PrefabInstance: propertyPath: startItems.Array.data[28].amount value: 1 objectReference: {fileID: 0} + - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: startItems.Array.data[5].autoEquip + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[7].autoEquip @@ -18342,6 +18347,11 @@ PrefabInstance: propertyPath: startItems.Array.data[28].indexArea value: 0 objectReference: {fileID: 0} + - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, + type: 3} + propertyPath: startItems.Array.data[5].addToEquipArea + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: startItems.Array.data[6].addToEquipArea @@ -19294,7 +19304,9 @@ MonoBehaviour: m_sunLight: {fileID: 1976683114} m_moonLight: {fileID: 0} WeatherPresent: 0 + WeatherSystem: {fileID: 0} m_sunLightExists: 1 + m_moonLightExists: 0 --- !u!4 &1013064392 Transform: m_ObjectHideFlags: 10 @@ -22865,6 +22877,8 @@ MonoBehaviour: x: 250 y: 250 z: 250 + m_allFloatingPointFixMembers: [] + m_allWorldSpaceParticleSystems: [] m_originTargetTileX: 0 m_originTargetTileZ: 0 m_terrainUnloadMemoryTreshold: 4294967296 diff --git a/Assets/Scenes/01_Wasteland/Wasteland.unity b/Assets/Scenes/01_Wasteland/Wasteland.unity index 9a02105a4..b57516508 100644 --- a/Assets/Scenes/01_Wasteland/Wasteland.unity +++ b/Assets/Scenes/01_Wasteland/Wasteland.unity @@ -9349,6 +9349,211 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1a421c49d039900488d31bef360a485d, type: 3} +--- !u!1 &23787858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 23787859} + - component: {fileID: 23787863} + - component: {fileID: 23787862} + - component: {fileID: 23787861} + - component: {fileID: 23787860} + m_Layer: 11 + m_Name: Main Quest trigger + m_TagString: Untagged + m_Icon: {fileID: 2800000, guid: 4e3e077817b8a684ea3c1fd5132b2f3f, type: 3} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &23787859 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23787858} + serializedVersion: 2 + m_LocalRotation: {x: -0.032429338, y: -0.016662203, z: -0.06622337, w: 0.9971385} + m_LocalPosition: {x: 177.54, y: 28.93, z: -119.22} + m_LocalScale: {x: 7.3460083, y: 6.6509113, z: 21.094938} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8941313038896858844} + m_LocalEulerAnglesHint: {x: -3.835, y: -1.662, z: -7.544} +--- !u!114 &23787860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23787858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3ee7654fb1dcff41b62c9ccb5f3111f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + m_fireOnce: 1 + m_wasFired: 0 + m_objectsToEnable: [] + m_objectsToDisable: [] + m_fireOnStart: 0 + m_triggersToFire: [] + m_delay: -1 + m_actionResponse: + barkConversation: + audioClip: {fileID: 0} + responseEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5567273486288236414} + m_TargetAssemblyTypeName: PixelCrushers.QuestMachine.Wrappers.QuestGiver, + Assembly-CSharp-firstpass + m_MethodName: GiveAllQuestsToQuester + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 569166459} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + delay: 0 + m_materialsToChange: [] +--- !u!82 &23787861 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23787858} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!65 &23787862 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23787858} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &23787863 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23787858} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &24245152 GameObject: m_ObjectHideFlags: 0 @@ -91854,6 +92059,70 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!21 &377366663 +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!4 &378273714 stripped Transform: m_CorrespondingSourceObject: {fileID: 7010295873574804791, guid: 04725a9f715fb81489cf487693f4505c, @@ -324402,6 +324671,171 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1205989709} m_PrefabAsset: {fileID: 0} +--- !u!43 &1207731099 +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!114 &1208118478 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4197548685982761983, guid: 851e8e61247888340bdec90fc8aa37f5, @@ -345236,6 +345670,171 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01470a9fc5334014e96e661ea7abf07e, type: 3} +--- !u!43 &1290360350 +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!4 &1290443777 stripped Transform: m_CorrespondingSourceObject: {fileID: 1278025358329255097, guid: bab2793d8b5d9014da7a4a0161daa9e4, @@ -395611,39 +396210,6 @@ Transform: m_Children: [] m_Father: {fileID: 1807495188} m_LocalEulerAnglesHint: {x: -0.589, y: 46.04, z: -0.769} ---- !u!21 &1498846895 -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 &1498964901 PrefabInstance: m_ObjectHideFlags: 0 @@ -459331,42 +459897,42 @@ PrefabInstance: - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -135 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210.00003 + value: 0 objectReference: {fileID: 0} - target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -45 + value: 0 objectReference: {fileID: 0} - target: {fileID: 693080501376609525, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -460326,22 +460892,22 @@ PrefabInstance: - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -225 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4550431665386167607, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -460371,22 +460937,22 @@ PrefabInstance: - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -315 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4816445967174237075, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -462110,22 +462676,22 @@ PrefabInstance: - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.x - value: 210 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} propertyPath: m_AnchoredPosition.y - value: -405 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7577249534107784839, guid: 851e8e61247888340bdec90fc8aa37f5, type: 3} @@ -477306,6 +477872,39 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0b2c2d0321c23e046b6a876880070881, type: 3} +--- !u!21 &1748161715 +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!1 &1749511388 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2387380482535964462, guid: 003daaab58a32ca419f0a3ef3dbef864, @@ -489556,70 +490155,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb0561d26335da64dbb36a9aac352726, type: 3} ---- !u!21 &1793310881 -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!1001 &1793621962 PrefabInstance: m_ObjectHideFlags: 0 @@ -640351,7 +640886,7 @@ BoxCollider: m_LayerOverridePriority: 0 m_IsTrigger: 1 m_ProvidesContacts: 0 - m_Enabled: 0 + m_Enabled: 1 serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} @@ -680750,7 +681285,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 1498846895} + - {fileID: 1748161715} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -680843,7 +681378,7 @@ MonoBehaviour: manualPositionAndScale: 0 renderPriority: 2 styledSpace0: 0 - overrideMaterial: {fileID: 1793310881} + overrideMaterial: {fileID: 377366663} overrideCamToVolumeDistance: Infinity overrideVolumeDistanceFade: 0 version: 180 @@ -682608,7 +683143,7 @@ MonoBehaviour: luaWizardIndex: -1 lastEvaluationValue: 0 setQuestState: 1 - questName: WastelandKillSpiders + questName: questState: 2 setQuestEntryState: 0 questEntryNumber: 1 @@ -682622,9 +683157,9 @@ MonoBehaviour: textTable: {fileID: 0} alertDuration: 0 sendMessages: [] - barkSource: 1 - barkConversation: CH01/WASTELAND/CH01_wasteland_vo_soil_wanderer_01 - barkText: What land is this with spiders as big as dogs? + barkSource: 0 + barkConversation: + barkText: barkTextSequence: barker: {fileID: 0} barkTarget: {fileID: 0} @@ -682650,24 +683185,12 @@ MonoBehaviour: onExecute: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 3366043013366499577} - m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine - m_MethodName: set_enabled - m_Mode: 6 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 1 - m_CallState: 2 - m_Target: {fileID: 7612718683960335314} m_TargetAssemblyTypeName: PixelCrushers.QuestMachine.QuestGiver, Assembly-CSharp-firstpass m_MethodName: GiveAllQuestsToQuester m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 0} + m_ObjectArgument: {fileID: 569166459} m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 @@ -751624,6 +752147,7 @@ Transform: - {fileID: 8166130686862209946} - {fileID: 5051528856207575542} - {fileID: 6251888608045925188} + - {fileID: 23787859} - {fileID: 4500177349366494242} - {fileID: 3105851397592944717} - {fileID: 628578316348536191} diff --git a/Assets/Scenes/Old_Levels!/TestHub.unity b/Assets/Scenes/Old_Levels!/TestHub.unity index 86696db62..b31ecb1b0 100644 --- a/Assets/Scenes/Old_Levels!/TestHub.unity +++ b/Assets/Scenes/Old_Levels!/TestHub.unity @@ -1916,7 +1916,7 @@ MonoBehaviour: m_EditorClassIdentifier: openCloseEvents: 0 openCloseWindow: 0 - selectedToolbar: 4 + selectedToolbar: 0 inputType: 0 actionInput: useInput: 1 @@ -2153,7 +2153,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: trigger: 32 - fireOnce: 1 + fireOnce: 0 condition: luaConditions: [] questConditions: [] @@ -2167,7 +2167,7 @@ MonoBehaviour: setQuestEntryState: 0 questEntryNumber: 1 questEntryState: 0 - luaCode: Variable["testCondition"] = true + luaCode: 'Variable["testCondition"] = not (Variable["testCondition"]) ' sequence: sequenceSpeaker: {fileID: 0} sequenceListener: {fileID: 0} @@ -2198,21 +2198,24 @@ MonoBehaviour: monitorConversationDistanceFrequency: 1 showCursorDuringConversation: 0 pauseGameDuringConversation: 0 - setActiveActions: - - condition: - luaConditions: [] - questConditions: [] - acceptedTags: [] - acceptedGameObjects: [] - luaWizardIndex: 0 - lastEvaluationValue: 0 - target: {fileID: 434772659} - state: 1 + setActiveActions: [] setEnabledActions: [] setAnimatorStateActions: [] onExecute: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 434772660} + m_TargetAssemblyTypeName: Beyond.ConditionalEventTrigger, Assembly-CSharp + m_MethodName: CheckConditionAndExecute + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 useConversationTitlePicker: 1 useBarkTitlePicker: 1 useQuestNamePicker: 1 @@ -2425,8 +2428,8 @@ GameObject: - component: {fileID: 434772659} - component: {fileID: 434772658} - component: {fileID: 434772657} - - component: {fileID: 434772655} - component: {fileID: 434772656} + - component: {fileID: 434772660} m_Layer: 0 m_Name: SaveSystemTestObject m_TagString: Untagged @@ -2434,84 +2437,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &434772655 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 434772654} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c593457cd8105e148906690e1707c592, type: 3} - m_Name: - m_EditorClassIdentifier: - trigger: 16 - fireOnce: 1 - condition: - luaConditions: - - Variable["testCondition"] ==true - questConditions: [] - acceptedTags: [] - acceptedGameObjects: [] - luaWizardIndex: -1 - lastEvaluationValue: 0 - setQuestState: 1 - questName: - questState: 0 - setQuestEntryState: 0 - questEntryNumber: 1 - questEntryState: 0 - luaCode: - sequence: - sequenceSpeaker: {fileID: 0} - sequenceListener: {fileID: 0} - waitOneFrameOnStartOrEnable: 1 - alertMessage: - textTable: {fileID: 0} - alertDuration: 0 - sendMessages: [] - barkSource: 0 - barkConversation: - barkText: - barkTextSequence: - barker: {fileID: 0} - barkTarget: {fileID: 0} - barkOrder: 0 - allowBarksDuringConversations: 0 - skipBarkIfNoValidEntries: 0 - cacheBarkLines: 0 - conversation: - conversationConversant: {fileID: 0} - conversationActor: {fileID: 0} - startConversationEntryID: -1 - exclusive: 0 - skipIfNoValidEntries: 0 - stopConversationOnTriggerExit: 0 - stopConversationIfTooFar: 0 - maxConversationDistance: 5 - monitorConversationDistanceFrequency: 1 - showCursorDuringConversation: 0 - pauseGameDuringConversation: 0 - setActiveActions: - - condition: - luaConditions: [] - questConditions: [] - acceptedTags: [] - acceptedGameObjects: [] - luaWizardIndex: 0 - lastEvaluationValue: 0 - target: {fileID: 434772659} - state: 1 - setEnabledActions: [] - setAnimatorStateActions: [] - onExecute: - m_PersistentCalls: - m_Calls: [] - useConversationTitlePicker: 1 - useBarkTitlePicker: 1 - useQuestNamePicker: 1 - selectedDatabase: {fileID: 11400000, guid: d6f6a47305abab144b7fc1a5e1f080ef, type: 2} --- !u!65 &434772656 BoxCollider: m_ObjectHideFlags: 0 @@ -2601,6 +2526,62 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &434772660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 434772654} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6709a146e599d4c46882e1173a52b192, type: 3} + m_Name: + m_EditorClassIdentifier: + m_key: TestConditionalEventTrigger + m_appendSaverTypeToKey: 0 + m_saveAcrossSceneChanges: 1 + m_restoreStateOnStart: 0 + condition: + luaConditions: + - Variable["testCondition"] ==true + questConditions: [] + acceptedTags: [] + acceptedGameObjects: [] + luaWizardIndex: -1 + lastEvaluationValue: 0 + fireOnce: 0 + onConditionTrue: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 434772654} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onConditionFalse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 434772654} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + selectedDatabase: {fileID: 0} --- !u!1 &437438685 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_body_Metal.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_body_Metal.mat index 08d3bd66b..2bcd4ff26 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_body_Metal.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_body_Metal.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -71,11 +72,15 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.34725177 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_head_metal.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_head_metal.mat index cb127e170..f709453ad 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_head_metal.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Adam_head_metal.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -71,11 +72,15 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.2734748 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Body_Metal.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Body_Metal.mat index a16abeaa0..0ad370018 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Body_Metal.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Body_Metal.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -71,11 +72,15 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.7953955 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Head_Metal.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Head_Metal.mat index 70838d077..054f998ec 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Head_Metal.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Eva_Head_Metal.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -71,11 +72,15 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.31563008 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Helmet.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Helmet.mat index 7d6192b1b..0a2c08758 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Helmet.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Helmet.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -71,11 +72,15 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.18990526 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Sword.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Sword.mat index 586f2efad..e3d0c6423 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Sword.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/2H_Weapon/Materials/Sword.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -75,12 +76,16 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.72 + - _GlossyReflections: 1 - _Metallic: 0.509 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.2689913 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Body_Metal.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Body_Metal.mat index b6203a17f..353cb69d7 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Body_Metal.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Body_Metal.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -71,11 +72,15 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.15252854 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Head_Metal.mat b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Head_Metal.mat index 2bd323228..3e6e289d9 100644 --- a/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Head_Metal.mat +++ b/Assets/ThirdParty/ANIMATIONS/MEDIEVAL_ANIMATIONS_MEGA_PACK_new/Weapon_and_Shield/Materials/Eva_Head_Metal.mat @@ -12,10 +12,11 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _EMISSION - _NORMALMAP - _SPECGLOSSMAP m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 @@ -71,11 +72,15 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossyReflections: 1 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _Shininess: 0.078125 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - _ZWrite: 1 diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat index 3375fde88..fd9bcbb81 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat @@ -65,11 +65,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BlendOp: 0 + - _BlendOp: 2 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 1 + - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c06a5669d..c22670df7 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,6 +8,9 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/MainMenu/MainMenu.unity guid: f76c4914eb27147428d79b9f7a1c000a + - enabled: 1 + path: Assets/Scenes/Old_Levels!/TestHub.unity + guid: 236f59b04e57a4940aab8cfaeccb71b5 - enabled: 1 path: Assets/Scenes/Old_Levels!/Land_01/demo_postptrocesINTRO.unity guid: e96c2977de1cfbd42842bca9554dc468 @@ -59,9 +62,6 @@ EditorBuildSettings: - enabled: 0 path: Assets/Scenes/Old_Levels!/Land_01/Land_Of_Death_ARENAS.unity guid: 3ac39dab4b05aa540af7a4bbd73b2a5a - - enabled: 1 - path: Assets/Scenes/Old_Levels!/TestHub.unity - guid: 236f59b04e57a4940aab8cfaeccb71b5 m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 272caeb75b6504dcb987edb253f851b7, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 08a91467c..09474655c 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -849,7 +849,7 @@ PlayerSettings: webWasm2023: 0 scriptingDefineSymbols: : UNITY_POST_PROCESSING_STACK_V2 - Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;ENEMIES_DISABLED + Android: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;USE_TIMELINE;USE_NEW_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;TMP_PRESENT;ENEMIES_DISABLED;MOBILE_INPUT CloudRendering: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER EmbeddedLinux: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER GameCoreScarlett: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER @@ -867,9 +867,9 @@ PlayerSettings: Standalone: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;TOUCH_REACT;GAIA_2_PRESENT;INVECTOR_AI_TEMPLATE;UPPipeline;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED VisionOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER WebGL: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER + Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;MOBILE_INPUT XboxOne: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER - iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED + iPhone: CROSS_PLATFORM_INPUT;INVECTOR_BASIC;INVECTOR_MELEE;GAIA_2_PRESENT;GAIA_PRO_PRESENT;UPPipeline;UNITY_POST_PROCESSING_STACK_V2;TOUCH_REACT;INVECTOR_AI_TEMPLATE;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER;URP_OUTLINE;ODIN_INSPECTOR;ODIN_INSPECTOR_3;TMP_PRESENT;USE_INVECTOR_INVENTORY;USE_TIMELINE;ODIN_INSPECTOR_3_1;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENEMIES_DISABLED;MOBILE_INPUT tvOS: UNITY_POST_PROCESSING_STACK_V2;PLAYMAKER;PLAYMAKER_1_9;PLAYMAKER_1_9_0;PLAYMAKER_1_8_OR_NEWER;PLAYMAKER_1_8_5_OR_NEWER;PLAYMAKER_1_9_OR_NEWER additionalCompilerArguments: {} platformArchitecture: {}